X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=67e6b8bad288a357e84d029bd998e569648a75a5;hb=2628e0868dfe51ea135788ce1c79184a74c1cac6;hp=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hpb=b82e4a59eba38d6a82141572ecb5d4fa160762b8;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 0470b644..67e6b8ba 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -37,20 +37,24 @@ class apache2 {
 		ensure => absent,
 	}
 
+	apache2::config { 'serve-cgi-bin':
+		ensure => absent,
+	}
+
 	apache2::config { 'ressource-limits':
 		ensure => absent,
 	}
 
-	if has_role('buildd_master') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nagiosmaster') {
-		$memlimit = 96 * 1024 * 1024
-	} elsif has_role('packagesqamaster') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nm') {
-		$memlimit = 96 * 1024 * 1024
+	if has_role('udd') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('sso') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('qamaster') {
+		$memlimit = 300 * 1024 * 1024
+	} elsif has_role('snapshot_master') {
+		$memlimit = 300 * 1024 * 1024
 	} else {
-		$memlimit = 32 * 1024 * 1024
+		$memlimit = 192 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':
@@ -77,6 +81,20 @@ class apache2 {
 		source => 'puppet:///modules/apache2/puppet-ssl-macros',
 	}
 
+	apache2::config { 'puppet-config':
+		content => template('apache2/puppet-config.erb'),
+	}
+
+	apache2::config { 'pratchett':
+		source => 'puppet:///modules/apache2/pratchett',
+	}
+
+	if $::lsbmajdistrelease > 7 {
+		file { '/etc/apache2/mods-available/mpm_worker.conf':
+			content => template('apache2/mpm_worker.erb'),
+		}
+	}
+
 	file { '/etc/apache2/sites-available/common-ssl.inc':
 		ensure => absent,
 	}