Merge pull request #56 from macaddict89/master

Update to 4.4
dj-wasabi · Nov 6, 2019 · 1c8ee84 · 1c8ee84
2 parents d1b8e3a + 4237010
commit 1c8ee84
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # defaults file for zabbix-proxy
 
-zabbix_version: 4.2
+zabbix_version: 4.4
 zabbix_repo: zabbix
 zabbix_proxy_package_state: present
 zabbix_proxy_install_database_client: True

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -28,9 +28,9 @@ def test_zabbix_package(Package, TestinfraBackend, proxy, SystemInfo):
         assert zabbix_proxy.is_installed
 
         if SystemInfo.distribution in ['debian', 'ubuntu']:
-            assert zabbix_proxy.version.startswith("1:4.2")
+            assert zabbix_proxy.version.startswith("1:4.4")
         elif SystemInfo.distribution == 'centos':
-            assert zabbix_proxy.version.startswith("4.2")
+            assert zabbix_proxy.version.startswith("4.4")
 
 
 def test_socket(Socket):

diff --git a/vars/zabbix.yml b/vars/zabbix.yml
@@ -1,6 +1,25 @@
 ---
 
 sign_keys:
+  "44":
+    bionic:
+      sign_key: A14FE591
+    sonya:
+      sign_key: A14FE591
+    serena:
+      sign_key: A14FE591
+    buster:
+      sign_key: A14FE591
+    stretch:
+      sign_key: A14FE591
+    wheezy:
+      sign_key: A14FE591
+    jessie:
+      sign_key: 79EA5ED4
+    trusty:
+      sign_key: 79EA5ED4
+    xenial:
+      sign_key: E709712C
   "42":
     bionic:
       sign_key: A14FE591