Include apache::mod::php if needed

voxpupuli · Nov 6, 2023 · 215c5b7 · 215c5b7
1 parent 7f9ba73
commit 215c5b7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,6 @@ node 'zabbix.example.com' {
   class { 'apache':
     mpm_module => 'prefork',
   }
-  include apache::mod::php
 
   class { 'zabbix':
     zabbix_url    => 'zabbix.example.com',
@@ -150,7 +149,6 @@ node 'zabbix.example.com' {
   class { 'apache':
     mpm_module => 'prefork',
   }
-  include apache::mod::php
 
   class { 'zabbix':
     zabbix_url    => 'zabbix.example.com',

diff --git a/REFERENCE.md b/REFERENCE.md
@@ -4936,7 +4936,6 @@ node 'wdpuppet02.dj-wasabi.local' {
   class { 'apache':
       mpm_module => 'prefork',
   }
-  class { 'apache::mod::php': }
   class { 'zabbix::web':
     zabbix_url    => 'zabbix.dj-wasabi.nl',
     zabbix_server => 'wdpuppet03.dj-wasabi.local',

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -82,7 +82,6 @@
 #     class { 'apache':
 #         mpm_module => 'prefork',
 #     }
-#     class { 'apache::mod::php': }
 #     class { 'zabbix::web':
 #       zabbix_url    => 'zabbix.dj-wasabi.nl',
 #       zabbix_server => 'wdpuppet03.dj-wasabi.local',
@@ -343,6 +342,8 @@
       }
     }
     else {
+      include apache::mod::php
+
       $apache_vhost_custom_fragment = "
         php_value max_execution_time ${apache_php_max_execution_time}
         php_value memory_limit ${apache_php_memory_limit}

diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -24,9 +24,6 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        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
@@ -33,9 +33,6 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        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
@@ -17,9 +17,6 @@
         class { 'apache':
             mpm_module => 'prefork',
         }
-        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
@@ -18,9 +18,6 @@
       class { 'apache':
         mpm_module => 'prefork',
       }
-      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
@@ -26,9 +26,6 @@
         class { 'apache':
           mpm_module => 'prefork',
         }
-        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
@@ -17,9 +17,6 @@
           class { 'apache':
               mpm_module => 'prefork',
           }
-          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/classes/web_spec.rb b/spec/classes/web_spec.rb
@@ -14,6 +14,16 @@
     }
   end
 
+  let :pre_condition do
+    <<~PUPPET
+      if $facts['os']['family'] != 'RedHat' {
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+      }
+    PUPPET
+  end
+
   on_supported_os(baseline_os_hash).each do |os, facts|
     supported_versions.each do |zabbix_version|
       next if facts[:os]['name'] == 'windows'