Merge pull request #893 from voxpupuli/el9

evgeni · web-flow · commit 1f78fee3b90d · 2023-10-05T09:57:45.000+02:00
add EL9 support
diff --git a/metadata.json b/metadata.json
@@ -60,7 +60,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -74,7 +75,8 @@
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -88,7 +90,8 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -49,6 +49,8 @@ class { 'postgresql::globals':
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "deploys a zabbix #{zabbix_version} server" do
       # Using puppet_apply as a helper
diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # Application API was removed in Zabbix 5.4
     next if zabbix_version >= '5.4'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     template = case zabbix_version
                when '5.0'
@@ -22,7 +24,9 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        include apache::mod::php
+        if $facts['os']['family'] != 'RedHat' {
+          include apache::mod::php
+        }
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
@@ -8,6 +8,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_host resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can
@@ -31,7 +33,9 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        include apache::mod::php
+        if $facts['os']['family'] != 'RedHat' {
+          include apache::mod::php
+        }
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_hostgroup resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can
@@ -15,7 +17,9 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        include apache::mod::php
+        if $facts['os']['family'] != 'RedHat' {
+          include apache::mod::php
+        }
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb
@@ -8,6 +8,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_proxy resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can
@@ -16,7 +18,9 @@
       class { 'apache':
         mpm_module => 'prefork',
       }
-      include apache::mod::php
+      if $facts['os']['family'] != 'RedHat' {
+        include apache::mod::php
+      }
       class { 'postgresql::globals':
         locale   => 'en_US.UTF-8',
         manage_package_repo => $facts['os']['release']['major'] != '8',
diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb
@@ -9,6 +9,8 @@
     next if zabbix_version == '6.0'
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_template_host resources with zabbix version #{zabbix_version}" do
       template = case zabbix_version
@@ -24,7 +26,9 @@
         class { 'apache':
           mpm_module => 'prefork',
         }
-        include apache::mod::php
+        if $facts['os']['family'] != 'RedHat' {
+          include apache::mod::php
+        }
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_template resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can
@@ -15,7 +17,9 @@
           class { 'apache':
               mpm_module => 'prefork',
           }
-          include apache::mod::php
+          if $facts['os']['family'] != 'RedHat' {
+            include apache::mod::php
+          }
           class { 'postgresql::globals':
             locale   => 'en_US.UTF-8',
             manage_package_repo => $facts['os']['release']['major'] != '8',

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`"operatingsystem": "RedHat",`
`61`	`61`	`"operatingsystemrelease": [`
`62`	`62`	`"7",`
`63`		`- "8"`
	`63`	`+ "8",`
	`64`	`+ "9"`
`64`	`65`	`]`
`65`	`66`	`},`
`66`	`67`	`{`
`@@ -74,7 +75,8 @@`
`74`	`75`	`"operatingsystem": "OracleLinux",`
`75`	`76`	`"operatingsystemrelease": [`
`76`	`77`	`"7",`
`77`		`- "8"`
	`78`	`+ "8",`
	`79`	`+ "9"`
`78`	`80`	`]`
`79`	`81`	`},`
`80`	`82`	`{`
`@@ -88,7 +90,8 @@`
`88`	`90`	`"operatingsystem": "CentOS",`
`89`	`91`	`"operatingsystemrelease": [`
`90`	`92`	`"7",`
`91`		`- "8"`
	`93`	`+ "8",`
	`94`	`+ "9"`
`92`	`95`	`]`
`93`	`96`	`},`
`94`	`97`	`{`