From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 25 Feb 2017 17:43:46 +0000 (+0100)
Subject: some hosts use mpm_prefork
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f97bd2a2a0cccb68e4de5e8cca2ebaebab0ab153;p=mirror%2Fdsa-puppet.git

some hosts use mpm_prefork
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 46f918c4a..89d7abc07 100644
--- 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 630d8453d..707cd1389 100644
--- 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'),