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 985620f..81e182a 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -7,6 +7,8 @@
 #   include apache2
 #
 class apache2 {
+       include webserver
+
        package { 'apache2':
                ensure => installed,
        }
@@ -52,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'),
@@ -85,10 +93,6 @@ class apache2 {
                content => template('apache2/puppet-config.erb'),
        }
 
-       apache2::config { 'pratchett':
-               ensure => 'absent',
-       }
-
        apache2::config { 'headers':
                source => 'puppet:///modules/apache2/headers',
        }
@@ -105,33 +109,14 @@ class apache2 {
                apache2::module { 'mpm_prefork': ensure => absent }
                apache2::module { 'mpm_worker': }
        }
-       if versioncmp($::lsbmajdistrelease, '7') > 0 {
-               file { '/etc/apache2/mods-available/mpm_worker.conf':
-                       content => template('apache2/mpm_worker.erb'),
-               }
-       }
-
-       file { '/etc/apache2/sites-available/common-ssl.inc':
-               ensure => absent,
+       file { '/etc/apache2/mods-available/mpm_worker.conf':
+               content => template('apache2/mpm_worker.erb'),
        }
 
        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',
@@ -153,23 +138,25 @@ class apache2 {
                ensure => installed,
        }
 
-       if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
-               include apache2::dynamic
-       } else {
-               @ferm::rule { 'dsa-http':
-                       prio        => '23',
-                       description => 'Allow web access',
-                       rule        => '&SERVICE(tcp, (http https))'
+       if (! has_role('apache_not_public')) {
+               if has_role('apache_ratelimited') {
+                       include apache2::dynamic
+               } else {
+                       ferm::rule { 'dsa-http':
+                               prio        => '23',
+                               description => 'Allow web access',
+                               rule        => '&SERVICE(tcp, (http https))'
+                       }
+
+                       ferm::rule { 'dsa-http-v6':
+                               domain          => '(ip6)',
+                               prio            => '23',
+                               description     => 'Allow web access',
+                               rule            => '&SERVICE(tcp, (http https))'
+                       }
                }
        }
 
-       @ferm::rule { 'dsa-http-v6':
-               domain          => '(ip6)',
-               prio            => '23',
-               description     => 'Allow web access',
-               rule            => '&SERVICE(tcp, (http https))'
-       }
-
        exec { 'service apache2 reload':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                command     => 'service apache2 reload',
@@ -182,13 +169,6 @@ class apache2 {
                notify  => Exec['service apache2 reload'],
        }
 
-       file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
-       concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
-               target => '/etc/cron.d/dsa-puppet-stuff',
-               content  => @(EOF)
-                       */2 * * * * root mkdir -p /run/dsa/shutdown-marker; if dsa-is-shutdown-scheduled; then echo 'system-in-shutdown' > /run/dsa/shutdown-marker/shutdown-in-progress; else rm -f /run/dsa/shutdown-marker/shutdown-in-progress; fi
-                       | EOF
-       }
        apache2::config { 'local-scheduled-shutdown':
                source  => 'puppet:///modules/apache2/local-scheduled-shutdown',
        }