Merge branch 'aurweb-6.2.16' into 'master'

New aurweb release, deprecations and fix loops

See merge request !910

roles/archmanweb/tasks/main.yml

@@ -46,7 +46,7 @@
     version={{ archmanweb_version }}
 # TODO
 #    verify_commit=true
-#    gpg_whitelist={{ archmanweb_pgp_key }}
+#    gpg_allowlist={{ archmanweb_pgp_key }}
   become: true
   become_user: archmanweb
   register: release

roles/archweb/tasks/main.yml

@@ -59,7 +59,7 @@
     dest="{{ archweb_dir }}"
     version={{ archweb_version }}
     verify_commit=true
-    gpg_whitelist={{ archweb_pgp_key }}
+    gpg_allowlist={{ archweb_pgp_key }}
   become: true
   become_user: archweb
   register: release

roles/aurweb/defaults/main.yml

@@ -8,7 +8,7 @@ aurweb_conf_dir: '/etc/aurweb'
 aurweb_git_dir: "{{ aurweb_dir }}/aur.git"
 aurweb_git_hook: '/usr/local/bin/aurweb-git-update'
 aurweb_nginx_conf: '/etc/nginx/nginx.d/aurweb.conf'
-aurweb_version: 'v6.2.15'
+aurweb_version: 'v6.2.16'
 aurweb_pgp_keys: [
   '2191B89431BAC0A8B96DE93D244740D17C7FD0EC', # artafinde
   'DB650286BD9EAE39890D3FE6FE3DC1668CB24956', # klausenbusk

roles/aurweb/tasks/main.yml

@@ -64,7 +64,7 @@
     dest="{{ aurweb_dir }}"
     version={{ aurweb_version }}
     verify_commit=true
-    gpg_whitelist='{{ aurweb_pgp_keys }}'
+    gpg_allowlist='{{ aurweb_pgp_keys }}'
   become: true
   become_user: "{{ aurweb_user }}"
   register: release
@@ -72,16 +72,12 @@
 
 - name: Install AUR systemd service and timers
   template: src={{ item.name }}.j2 dest=/etc/systemd/system/{{ item.name }} owner=root group=root mode=0644
-  loop:
-    - "{{ aurweb_services }}"
-    - "{{ aurweb_timers }}"
+  loop: "{{ aurweb_services + aurweb_timers }}"
   when: release.changed and (item.install is not defined or item.install)
 
 - name: Stop AUR systemd services and timers
   service: name={{ item.name }} enabled=yes state=stopped
-  loop:
-    - "{{ aurweb_services }}"
-    - "{{ aurweb_timers }}"
+  loop: "{{ aurweb_services + aurweb_timers }}"
   when: release.changed and (item.restart is not defined or item.restart)
 
 - name: Clone aurweb repo
@@ -90,7 +86,7 @@
     dest="{{ aurweb_dir }}"
     version={{ aurweb_version }}
     verify_commit=true
-    gpg_whitelist='{{ aurweb_pgp_keys }}'
+    gpg_allowlist='{{ aurweb_pgp_keys }}'
   become: true
   become_user: "{{ aurweb_user }}"
   when: release.changed
@@ -290,9 +286,7 @@
 
 - name: Start and enable AUR systemd services and timers
   systemd_service: name={{ item.name }} enabled=yes state=started daemon_reload=yes
-  loop:
-    - "{{ aurweb_services }}"
-    - "{{ aurweb_timers }}"
+  loop: "{{ aurweb_services + aurweb_timers }}"
   when: release.changed and (item.restart is not defined or item.restart)
 
 - name: Generate and import dummy data

roles/bugbot/tasks/main.yml

@@ -13,7 +13,7 @@
     dest: /srv/bugbot
     force: true
     verify_commit: true
-    gpg_whitelist: '{{ bugbot_pgp_keys }}'
+    gpg_allowlist: '{{ bugbot_pgp_keys }}'
     version: '{{ bugbot_version }}'
 
 - name: Install env file