From 28cc303db7739132db00c94d02b382153f24728b Mon Sep 17 00:00:00 2001 From: AntonP8O Date: Sun, 24 Mar 2024 20:29:45 +1000 Subject: [PATCH] fixid --- install-packages.yml | 152 +++++++++++++++++++++++++++++++++++-------- invertory.ini | 3 +- vars.yml | 3 +- 3 files changed, 129 insertions(+), 29 deletions(-) diff --git a/install-packages.yml b/install-packages.yml index ca7610c..4b21bf2 100644 --- a/install-packages.yml +++ b/install-packages.yml @@ -4,10 +4,10 @@ vars_files: - vars.yml tasks: - - name: Update apt - ansible.builtin.shell: - cmd: apt update - become: yes + # - name: Update apt + # ansible.builtin.shell: + # cmd: apt update + # become: yes - name: Install packages apt: @@ -69,29 +69,30 @@ group: "{{ user_name }}" mode: 0644 - - name: Create directory - file: + - name: Создание директории /etc/apt/keyrings + ansible.builtin.file: path: /etc/apt/keyrings state: directory - - - name: Downloading and accepting gpg key - command: wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | gpg --dearmor -o /etc/apt/keyrings/gierens.gpg - args: - creates: /etc/apt/keyrings/gierens.gpg - register: gpg_key_added - - - name: accepting GPG key rewriting - command: echo "Y" - when: gpg_key_added.stdout is search("Файл '/etc/apt/keyrings/gierens.gpg' существует. Записать поверх?") - - - name: Add repository to source list - lineinfile: - path: /etc/apt/sources.list.d/gierens.list - line: "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" + mode: '0755' become: yes - - name: Modify permissions of files - file: + - name: Загрузка и деармирование GPG ключа + ansible.builtin.shell: + cmd: | + wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo gpg --dearmor -o /etc/apt/keyrings/gierens.gpg + # args: + + # creates: /etc/apt/keyrings/gierens.gpg + + - name: Добавление репозитория eza в список источников + ansible.builtin.lineinfile: + path: /etc/apt/sources.list.d/gierens.list + line: "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" + create: yes + become: yes + + - name: Установка прав доступа для GPG ключа и списка источников + ansible.builtin.file: path: "{{ item }}" mode: '0644' with_items: @@ -99,13 +100,110 @@ - /etc/apt/sources.list.d/gierens.list become: yes - - name: Update apt and install eza - apt: - name: eza + - name: Обновление кэша apt + ansible.builtin.apt: update_cache: yes - state: present become: yes + - name: Установка eza + ansible.builtin.apt: + name: eza + state: present + update_cache: yes + become: yes + + + # - name: Ensure the /etc/apt/keyrings directory exists + # ansible.builtin.file: + # path: /etc/apt/keyrings + # state: directory + # mode: '0755' + # become: yes + + # - name: Download and dearmor the GPG key + # ansible.builtin.get_url: + # url: https://raw.githubusercontent.com/eza-community/eza/main/deb.asc + # dest: /tmp/deb.asc + # # register: download_gpg + + # - name: De-armor the GPG key + # command: gpg --dearmor -o /etc/apt/keyrings/gierens.gpg + # args: + # creates: /etc/apt/keyrings/gierens.gpg + # # when: download_gpg is changed + # register: gpg_key_added + # become: yes + + # - name: accepting GPG key rewriting + # command: echo "Y" + # when: gpg_key_added is search("Файл '/etc/apt/keyrings/gierens.gpg' существует. Записать поверх?") + + # - name: Add the eza repository to the sources list + # ansible.builtin.lineinfile: + # path: /etc/apt/sources.list.d/gierens.list + # line: "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" + # create: yes + # become: yes + + # - name: Set the correct permissions for the GPG key and sources list + # ansible.builtin.file: + # path: "{{ item }}" + # mode: '0644' + # with_items: + # - /etc/apt/keyrings/gierens.gpg + # - /etc/apt/sources.list.d/gierens.list + # become: yes + + # - name: Update the apt cache + # ansible.builtin.apt: + # update_cache: yes + # become: yes + + # - name: Install eza + # ansible.builtin.apt: + # name: eza + # state: present + # update_cache: yes + # become: yes + + # - name: Create directory + # file: + # path: /etc/apt/keyrings + # state: directory + # become: yes + + # - name: Downloading and accepting gpg key + # command: wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo gpg --dearmor -o /etc/apt/keyrings/gierens.gpg + # args: + # creates: /etc/apt/keyrings/gierens.gpg + # register: gpg_key_added + + # - name: accepting GPG key rewriting + # command: echo "Y" + # when: gpg_key_added.stdout is search("Файл '/etc/apt/keyrings/gierens.gpg' существует. Записать поверх?") + + # - name: Add repository to source list + # lineinfile: + # path: /etc/apt/sources.list.d/gierens.list + # line: "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" + # become: yes + + # - name: Modify permissions of files + # file: + # path: "{{ item }}" + # mode: '0644' + # with_items: + # - /etc/apt/keyrings/gierens.gpg + # - /etc/apt/sources.list.d/gierens.list + # become: yes + + # - name: Update apt and install eza + # apt: + # name: eza + # update_cache: yes + # state: present + # become: yes + - name: Downloading bat-musl_0.24.0_amd64.deb shell: wget https://github.com/sharkdp/bat/releases/download/v0.24.0/bat-musl_0.24.0_amd64.deb args: diff --git a/invertory.ini b/invertory.ini index b9e75e2..234beb8 100755 --- a/invertory.ini +++ b/invertory.ini @@ -1,2 +1,3 @@ [vm] -192.168.3.227 ansible_user=p8o ansible_ssh_private_key_file=~/.ssh/prokopenko +192.168.3.135 ansible_user=p8o ansible_ssh_private_key_file=~/.ssh/prokopenko ansible_ssh_extra_args='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' + diff --git a/vars.yml b/vars.yml index 20511bb..ab04a3f 100644 --- a/vars.yml +++ b/vars.yml @@ -6,4 +6,5 @@ packages_list: - name: zsh - name: dnsutils - name: gpg - - name: wget \ No newline at end of file + - name: wget + - name: curl \ No newline at end of file