From 3b51a3d70ba8b902d4585297c5b25802d317426e Mon Sep 17 00:00:00 2001
From: James Antill <jantill@redhat.com>
Date: Jan 28 2025 17:55:27 +0000
Subject: Move to the EPEL zabbix-7.0 release


---

diff --git a/roles/zabbix/zabbix_server/defaults/main.yml b/roles/zabbix/zabbix_server/defaults/main.yml
index 0c0b785..4ed12e2 100644
--- a/roles/zabbix/zabbix_server/defaults/main.yml
+++ b/roles/zabbix/zabbix_server/defaults/main.yml
@@ -9,13 +9,14 @@ zabbix_db_user: zabbix     # OVERRIDE
 zabbix_db_pass: zabbix     # OVERRIDE
 
 zabbix_server_pkgs:
-  - zabbix-server-pgsql
-  - zabbix-web-pgsql
-  - zabbix-nginx-conf
-  - zabbix-sql-scripts
-  - zabbix-selinux-policy
-  - zabbix-agent
+  - zabbix7.0-server-pgsql
+  - zabbix7.0-web-pgsql
+  # These don't exist in the EPEL builds, but were in upstream...
+  # - zabbix-nginx-conf
+  # - zabbix-sql-scripts
+  - zabbix7.0-selinux
+  - zabbix7.0-agent
+  # These two maybe aren't needed anymore?
   - postgresql-server
   - python3-psycopg2
   - nmap
-  - php-openssl
diff --git a/roles/zabbix/zabbix_server/tasks/install.yml b/roles/zabbix/zabbix_server/tasks/install.yml
index 1ceb226..2f36810 100644
--- a/roles/zabbix/zabbix_server/tasks/install.yml
+++ b/roles/zabbix/zabbix_server/tasks/install.yml
@@ -11,16 +11,9 @@
     gpgcheck: true
     baseurl: "http://infrastructure.fedoraproject.org/pub/epel/9/Everything/$basearch/"
     gpgkey: "http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
-    exclude: "zabbix*"
   tags:
     - configure-dnf
 
-- name: Install the zabbix rpm
-  ansible.builtin.command: "rpm -Uvh https://repo.zabbix.com/zabbix/6.0/rhel/9/x86_64/zabbix-release-latest.el9.noarch.rpm"
-  ignore_errors: true
-  tags:
-    - packages
-
 - name: Installing required pkgs for Zabbix
   ansible.builtin.dnf:
     name: "{{ zabbix_server_pkgs }}"