Merge pull request #413 from Normo/412-apt-key-deprecation

Use deb822_repository module to add apt repositories

Author: Normo

molecule/gitlab/prepare.yml

@@ -29,6 +29,8 @@
             name:
               - "sudo"      # for `become` privilege escalation
               - "iproute2"  # for gathering network facts
+              - "python3-debian"
+              - "ca-certificates"
             state: "present"
             update_cache: true
 

molecule/zammad/prepare.yml

@@ -28,6 +28,7 @@
           - "gpg"
           - "ca-certificates"
           - "python3-cryptography"
+          - "python3-debian"
           - "ssl-cert"
         state: "present"
         update_cache: true

roles/gitlab/tasks/install.yml

@@ -14,36 +14,45 @@
 - name: "Prepare Debian GitLab installation"
   when: "ansible_facts.os_family == 'Debian'"
   block:
-    - name: "Install APT GPG key"
+    - name: "Remove GitLab APT GPG key from legacy trusted.gpg keyring"
       ansible.builtin.apt_key:
         url: "{{ gitlab_gpg_key_url }}"
         id: "{{ gitlab_gpg_key_id }}"
-        state: "present"
+        state: "absent"
       when: "not gitlab_is_initial_dryrun"
 
-    - name: "Add GitLab APT repository"
+    - name: "Remove GitLab APT repository from sources.list"
       ansible.builtin.apt_repository:
         repo: "deb {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
-        state: "present"
+        state: "absent"
         filename: "gitlab_{{ gitlab_edition }}"
-        mode: "0644"
 
-    - name: "Add GitLab source APT repository"
+    - name: "Remove GitLab source APT repository from sources.list"
       ansible.builtin.apt_repository:
         repo: "deb-src {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
-        state: "present"
+        state: "absent"
         filename: "gitlab_{{ gitlab_edition }}"
+
+    - name: "Add GitLab APT repository"
+      ansible.builtin.deb822_repository:
+        name: "{{ gitlab_edition }}"
+        types:
+          - "deb"
+          - "deb-src"
+        uris: "{{ gitlab_repo_url }}"
+        suites: "{{ ansible_facts.distribution_release | lower }}"
+        components: "main"
+        signed_by: "{{ gitlab_gpg_key_url }}"
+        architectures: "amd64"
+        state: "present"
         mode: "0644"
+        enabled: true
 
     - name: "Update APT package cache"
       ansible.builtin.apt:
         update_cache: true
-        cache_valid_time: 3600
-      register: "gitlab_apt_cache"
       check_mode: false
-      changed_when:
-        - "gitlab_apt_cache.cache_updated"
-        - "not ansible_check_mode"
+      changed_when: false
 
 - name: "Install GitLab on RedHat Like OS"
   when: "ansible_facts.os_family == 'RedHat'"

roles/zammad/defaults/main.yml

@@ -6,6 +6,7 @@
 ---
 zammad_version: "6.5.0"
 zammad_release_channel: "stable"
+zammad_repo_url: "https://dl.packager.io/srv/deb/zammad/zammad/{{ zammad_release_channel }}/{{ ansible_facts.distribution | lower }}"
 zammad_domain_name: "{{ ansible_fqdn }}"
 
 zammad_nginx_config_path: "/etc/nginx/sites-available/zammad.conf"

roles/zammad/tasks/install.yml

@@ -30,18 +30,34 @@
   when: "ansible_distribution | lower == 'ubuntu'"
   block:
 
-    - name: "Install | Add Zammad apt key"
+    - name: "Remove Zammad apt key from legacy trusted.gpg keyring"
       ansible.builtin.apt_key:
         url: "https://dl.packager.io/srv/zammad/zammad/key"
-        state: "present"
+        state: "absent"
 
-    - name: "Install | Add Zammad DEB repository"
+    - name: "Remove Zammad DEB repository from sources.list"
       ansible.builtin.apt_repository:
         repo: "deb https://dl.packager.io/srv/deb/zammad/zammad/{{ zammad_release_channel }}/ubuntu {{ ansible_distribution_version }} main"
-        state: "present"
+        state: "absent"
         filename: "zammad"
-        update_cache: true
+
+    - name: "Install | Add Zammad DEB repository"
+      ansible.builtin.deb822_repository:
+        name: "zammad"
+        types: "deb"
+        uris: "{{ zammad_repo_url }}"
+        suites: "{{ ansible_facts.distribution_version }}"
+        components: "main"
+        signed_by: "https://dl.packager.io/srv/zammad/zammad/key"
+        architectures: "amd64"
+        state: "present"
         mode: "0644"
+        enabled: true
+
+    - name: "Update apt cache"
+      ansible.builtin.apt:
+        update_cache: true
+      changed_when: false
 
 - name: "Gather the package facts to check wether Zammad has already been installed"
   ansible.builtin.package_facts: