Merge pull request #162 from waynegemmell/master

fix(repo): update repo config for keyring

Author: hatifnatt

zabbix/osfingermap.yaml

@@ -11,13 +11,35 @@
 # osfingermap: {}
 ---
 # os: Debian
-Debian-10: {}
-Debian-9: {}
-Debian-8: {}
+Debian-12:
+  repo_signedby: signedby=/etc/apt/keyrings/zabbix.gpg
+  repo_aptkey: false
+Debian-11:
+  repo_signedby: ""
+  repo_aptkey: true
+Debian-10:
+  repo_signedby: ""
+  repo_aptkey: true
+Debian-9:
+  repo_signedby: ""
+  repo_aptkey: true
+Debian-8:
+  repo_signedby: ""
+  repo_aptkey: true
 
 # os: Ubuntu
-Ubuntu-18.04: {}
-Ubuntu-16.04: {}
+Ubuntu-22.04:
+  repo_signedby: signedby=/etc/apt/keyrings/zabbix.gpg
+  repo_aptkey: false
+Ubuntu-20.04:
+  repo_signedby: ""
+  repo_aptkey: true
+Ubuntu-18.04:
+  repo_signedby: ""
+  repo_aptkey: true
+Ubuntu-16.04:
+  repo_signedby: ""
+  repo_aptkey: true
 
 # os: Fedora
 Fedora-31: {}

zabbix/repo.sls

@@ -24,10 +24,12 @@
     - name: apt-transport-https
 {{ id_prefix }}_repo:
   pkgrepo.managed:
-    - name: deb https://repo.zabbix.com/zabbix/{{ zabbix.version_repo }}/{{ salt['grains.get']('os')|lower }} {{ salt['grains.get']('oscodename') }} main
+    - name: deb [ arch={{ salt['grains.get']('osarch')|lower }} {{ zabbix.repo_signedby }} ]
+        https://repo.zabbix.com/zabbix/{{ zabbix.version_repo }}/{{ salt['grains.get']('os')|lower }} {{ salt['grains.get']('oscodename') }} main
     - file: /etc/apt/sources.list.d/zabbix.list
     - key_url: https://repo.zabbix.com/zabbix-official-repo.key
     - clean_file: True
+    - aptkey: {{ zabbix.repo_aptkey }}
 
 {%- elif salt['grains.get']('os_family') == 'RedHat' and
          salt['grains.get']('osmajorrelease')|int >= 6 %}