diff --git a/roles/base/tasks/ansible_setup.yml b/roles/base/tasks/ansible_setup.yml index aa13b58..13cae67 100644 --- a/roles/base/tasks/ansible_setup.yml +++ b/roles/base/tasks/ansible_setup.yml @@ -13,21 +13,12 @@ when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] -- name: ansible setup | get key - tags: ansible,ansible-setup - get_url: - url: "https://keyserver.ubuntu.com/pks/lookup?fingerprint=on&op=get&search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367" # required. HTTP, HTTPS, or FTP URL in the form (http|https|ftp)://[user[:pass]]@host.domain[:port]/path - dest: "/tmp/ansible-archive-keyring.asc" # Download to a temporary location +- name: ansible setup | remove ansible archive keyring + file: + path: /usr/share/keyrings/ansible-archive-keyring.gpg + state: absent when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] -- name: ansible setup | dearmor GPG key and place in /usr/share/keyrings - ansible.builtin.command: - cmd: "gpg --dearmor -o /usr/share/keyrings/ansible-archive-keyring.gpg /tmp/ansible-archive-keyring.asc" - creates: "/usr/share/keyrings/ansible-archive-keyring.gpg" - when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] - # Hinweis: Der 'warn: false' Parameter wurde aufgrund eines Konflikts entfernt. - # Diese Aufgabe ist entscheidend für die moderne APT-Schlüsselverwaltung. - - name: ansible setup | remove repository file - Debian file: path: /etc/apt/sources.list.d/ansible.list @@ -43,24 +34,6 @@ filename: ansible when: ansible_facts['distribution'] in ["Debian", "Ubuntu"] -- name: ansible setup | update repository - Debian - tags: ansible,ansible-setup - apt_repository: - repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution_release']]['ubuntu'] }} main" - state: present - update_cache: yes - filename: ansible - when: ansible_facts['distribution'] == "Debian" - -- name: ansible setup | update repository - Ubuntu - tags: ansible,ansible-setup - apt_repository: - repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_facts['distribution_release'] }} main" - state: present - update_cache: yes - filename: ansible - when: ansible_facts['distribution'] == "Ubuntu" - - name: ansible setup | ensure ansible is the latest version tags: ansible,ansible-setup package: diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 9f6a490..0f89504 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -20,7 +20,6 @@ - wireguard == true - ansible_default_ipv4.address | ansible.utils.ipaddr('public') ignore_errors: True - - import_tasks: ansible_setup.yml - import_tasks: system_setup/git.yml # install software # - import_tasks: software/repositories.yml