Initial Changes to Server Role

pyrodie18 · Jun 6, 2024 · 784a65a · 784a65a
1 parent 3e3cfd4
commit 784a65a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -41,6 +41,10 @@ jobs:
             version: v62
           - container: ubuntu2404
             version: v62
+          - container: ubuntu2004
+            version: v70
+          - container: debian11
+            version: v70
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v70}
 
 provisioner:
   name: ansible
@@ -25,6 +25,8 @@ provisioner:
       all:
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_server_version: 7.0
       v64:
         zabbix_server_version: 6.4
       v62:

diff --git a/roles/zabbix_server/tasks/selinux.yml b/roles/zabbix_server/tasks/selinux.yml
@@ -6,6 +6,7 @@
       - policycoreutils
       - python3-libsemanage
       - python3-policycoreutils
+      - zabbix-selinux-policy
   environment:
     http_proxy: "{{ zabbix_http_proxy | default(None) | default(omit) }}"
     https_proxy: "{{ zabbix_https_proxy | default(None) | default(omit) }}"

diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -8,6 +8,7 @@ mysql_create_dir: ""
 zabbix_valid_server_versions:
   # Debian
   "12":
+    - 7.0
     - 6.4
     - 6.0
   "11":
@@ -16,9 +17,11 @@ zabbix_valid_server_versions:
     - 6.0
   # Ubuntu
   "24":
+    - 7.0
     - 6.4
     - 6.0
   "22":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0

diff --git a/roles/zabbix_server/vars/RedHat.yml b/roles/zabbix_server/vars/RedHat.yml
@@ -10,10 +10,12 @@ __epel_repo:
 
 zabbix_valid_server_versions:
   "9":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
   "8":
+    - 7.0
     - 6.4
     - 6.2
     - 6.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ mysql_create_dir: "" @@
     zabbix_valid_server_versions:
       # Debian
       "12":
+        - 7.0
         - 6.4
         - 6.0
       "11":
@@ Expand All / @@ -16,9 +17,11 @@ zabbix_valid_server_versions: @@
         - 6.0
       # Ubuntu
       "24":
+        - 7.0
         - 6.4
         - 6.0
       "22":
+        - 7.0
         - 6.4
         - 6.2
         - 6.0
@@ Expand Down @@