some hosts use mpm_prefork

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 46f918c..89d7abc 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -296,3 +296,8 @@ roles:
     - mirror-conova.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
+  apache_prefork:
+    # php needs this
+    - quantz.debian.org
+    - tchaikovsky.debian.org
+    - wuiet.debian.org

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 630d845..707cd13 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -93,7 +93,13 @@ class apache2 {
        }
 
        apache2::module { 'mpm_event': ensure => absent }
-       apache2::module { 'mpm_worker': }
+       if has_role('apache_prefork') {
+               apache2::module { 'mpm_worker': ensure => absent }
+               apache2::module { 'mpm_prefork': }
+       } else {
+               apache2::module { 'mpm_prefork': ensure => absent }
+               apache2::module { 'mpm_worker': }
+       }
        if $::lsbmajdistrelease > 7 {
                file { '/etc/apache2/mods-available/mpm_worker.conf':
                        content => template('apache2/mpm_worker.erb'),