Merge pull request #81 from hatifnatt/make_use_of_key_url

Get rid of manual GPG key management for Debian. Related to #79
saltstack-formulas · Mar 30, 2018 · 500e505 · 500e505
2 parents e11af0e + 59550d5
commit 500e505
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 66 deletions.
diff --git a/zabbix/files/default/tmp/zabbix-official-repo.gpg b/zabbix/files/default/tmp/zabbix-official-repo.gpg
diff --git a/zabbix/repo.sls b/zabbix/repo.sls
@@ -25,23 +25,7 @@
   pkgrepo.managed:
     - name: deb http://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
-    - require:
-      - cmd: {{ id_prefix }}_repo_add_gpg
-
-
-{{ id_prefix }}_repo_add_gpg:
-  cmd.wait:
-    - name: /usr/bin/apt-key add /var/tmp/zabbix-official-repo.gpg
-    - watch:
-      - file: {{ id_prefix }}_repo_gpg_file
-
-
-# GPG key of official Zabbix repo
-{{ id_prefix }}_repo_gpg_file:
-  file.managed:
-    - name: /var/tmp/zabbix-official-repo.gpg
-    - source: {{ files_switch('zabbix',
-                              ['/tmp/zabbix-official-repo.gpg']) }}
+    - key_url: https://repo.zabbix.com/zabbix-official-repo.key
 
 
 {%- elif salt['grains.get']('os_family') == 'RedHat' and