stop using virtual resources for ferm::rule

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5f289cb..81e182a 100644 (file)
--- 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',