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 ce7c927..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'),
@@ -87,10 +93,6 @@ class apache2 {
                content => template('apache2/puppet-config.erb'),
        }
 
-       apache2::config { 'pratchett':
-               ensure => 'absent',
-       }
-
        apache2::config { 'headers':
                source => 'puppet:///modules/apache2/headers',
        }
@@ -111,27 +113,10 @@ class apache2 {
                content => template('apache2/mpm_worker.erb'),
        }
 
-       file { '/etc/apache2/sites-available/common-ssl.inc':
-               ensure => absent,
-       }
-
        file { '/etc/logrotate.d/apache2':
                source => 'puppet:///modules/apache2/apache2.logrotate',
        }
 
-       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs', '/srv/www/default.debian.org/htdocs-disabled' ]:
-               ensure  => directory,
-               mode    => '0755',
-       }
-
-       file { '/srv/www/default.debian.org/htdocs/index.html':
-               content => template('apache2/default-index.html'),
-       }
-
-       file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
-               content => template('apache2/disabled-index.html'),
-       }
-
        file { '/var/log/apache2':
                ensure => directory,
                mode   => '0755',
@@ -157,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',