X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707;hb=184619433f4bd137cef8fc1454516258dd6541b2;hp=ee631fe166ac1fc02e99afe726e134d68d43706a;hpb=89fc076c1e193a7a052008feb61a0276afce523a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ee631fe16..8be585bfa 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -47,12 +47,14 @@ class apache2 {
 
 	if has_role('udd') {
 		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('dgit_git') {
+		$memlimit = 512 * 1024 * 1024
 	} elsif has_role('sso') {
 		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('popcon') {
+		$memlimit = 512 * 1024 * 1024
 	} elsif has_role('qamaster') {
 		$memlimit = 300 * 1024 * 1024
-	} elsif has_role('snapshot_master') {
-		$memlimit = 1536 * 1024 * 1024
 	} else {
 		$memlimit = 192 * 1024 * 1024
 	}
@@ -141,4 +143,11 @@ class apache2 {
 		description     => 'Allow web access',
 		rule            => '&SERVICE(tcp, (http https))'
 	}
+
+	exec { 'service apache2 reload':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'service apache2 reload',
+		refreshonly => true,
+		require =>  Package['apache2'],
+	}
 }