X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=fba3b38905b67a79bf0197ba63b6c42d5b60463f;hb=d8092dac8d43bc6d789c26cf7e1862d5464e9b39;hp=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hpb=b82e4a59eba38d6a82141572ecb5d4fa160762b8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 0470b644b..fba3b3890 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -43,6 +43,8 @@ class apache2 {
 
 	if has_role('buildd_master') {
 		$memlimit = 192 * 1024 * 1024
+	} elsif has_role('buildd_ports_master') {
+		$memlimit = 192 * 1024 * 1024
 	} elsif has_role('nagiosmaster') {
 		$memlimit = 96 * 1024 * 1024
 	} elsif has_role('packagesqamaster') {
@@ -77,6 +79,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':
+			source => 'puppet:///modules/apache2/mpm_worker',
+		}
+	}
+
 	file { '/etc/apache2/sites-available/common-ssl.inc':
 		ensure => absent,
 	}