Merge pull request puppetlabs#1720 from MiamiOH/correct_mod_cgi

Fix case of setting apache::mpm_module to false
cegeka · Dec 13, 2017 · d319e7f · d319e7f
2 parents d08e55f + af74d95
commit d319e7f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
@@ -1,9 +1,14 @@
 class apache::mod::cgi {
+  include ::apache
   case $::osfamily {
     'FreeBSD': {}
     default: {
-      if $::apache::mpm_module =~ /^(itk|peruser|prefork)$/ {
-        Class["::apache::mod::${::apache::mpm_module}"] -> Class['::apache::mod::cgi']
+      if defined(Class['::apache::mod::itk']) {
+        Class['::apache::mod::itk'] -> Class['::apache::mod::cgi']
+      } elsif defined(Class['::apache::mod::peruser']) {
+        Class['::apache::mod::peruser'] -> Class['::apache::mod::cgi']
+      } else {
+        Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
       }
     }
   }