X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=81e182a99af66ec764a9211824e8b4232eb3cf85;hb=9a5f1c9b36632c4a9ac4937a49ba36def89b1dd5;hp=5f289cb38e24d0d052ae51ef7310d1ddf70d23df;hpb=b35029960fcfa6a60da9624bf33b3e90dbe29144;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5f289cb38..81e182a99 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -54,6 +54,12 @@ class apache2 {
 	} else {
 		$memlimit = 192 * 1024 * 1024
 	}
+	# debbugs cgis like to fork and don't deal well with EAGAIN
+	if has_role('bugs_base') {
+		$proclimit = 450
+	} else {
+		$proclimit = 256
+	}
 
 	apache2::config { 'resource-limits':
 		content => template('apache2/resource-limits.erb'),
@@ -136,13 +142,13 @@ class apache2 {
 		if has_role('apache_ratelimited') {
 			include apache2::dynamic
 		} else {
-			@ferm::rule { 'dsa-http':
+			ferm::rule { 'dsa-http':
 				prio        => '23',
 				description => 'Allow web access',
 				rule        => '&SERVICE(tcp, (http https))'
 			}
 
-			@ferm::rule { 'dsa-http-v6':
+			ferm::rule { 'dsa-http-v6':
 				domain          => '(ip6)',
 				prio            => '23',
 				description     => 'Allow web access',