setup-all-dchroots: stop creating s390 chroots on s390x

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 008dab8..b8e76ad 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -32,27 +32,35 @@ class apache2 {
                site     => 'default-debian.org',
                content  => template('apache2/default-debian.org.erb'),
        }
+       apache2::site { 'xx-default-ssl':
+               site     => 'default-debian.org-ssl',
+               content  => template('apache2/default-debian.org-ssl.erb'),
+       }
 
        apache2::site { '000-default':
                ensure => absent,
        }
 
+       apache2::config { 'serve-cgi-bin':
+               ensure => absent,
+       }
+
        apache2::config { 'ressource-limits':
                ensure => absent,
        }
 
-       if has_role('buildd_master') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('buildd_ports_master') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('nagiosmaster') {
-               $memlimit = 96 * 1024 * 1024
-       } elsif has_role('packagesqamaster') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('nm') {
-               $memlimit = 96 * 1024 * 1024
+       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
        } else {
-               $memlimit = 32 * 1024 * 1024
+               $memlimit = 192 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':
@@ -139,4 +147,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'],
+       }
 }