only load mod::php on non EL systems

on EL we default to FPM anyway
voxpupuli · Oct 4, 2023 · 29d542a · 29d542a
1 parent 42a2d90
commit 29d542a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -22,7 +22,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
@@ -31,7 +31,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
@@ -15,7 +15,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
@@ -16,7 +16,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
@@ -24,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_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
@@ -15,7 +15,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',