Add some HTML for disabled services to use

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 41c1403..ac46632 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -32,6 +32,10 @@ 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,
@@ -47,6 +51,8 @@ class apache2 {
 
        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') {
@@ -81,6 +87,10 @@ class apache2 {
                source => 'puppet:///modules/apache2/puppet-ssl-macros',
        }
 
+       apache2::config { 'puppet-ftp-macros':
+               source => 'puppet:///modules/apache2/puppet-ftp-macros',
+       }
+
        apache2::config { 'puppet-config':
                content => template('apache2/puppet-config.erb'),
        }
@@ -103,7 +113,7 @@ class apache2 {
                source => 'puppet:///modules/apache2/apache2.logrotate',
        }
 
-       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+       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',
        }
@@ -112,6 +122,10 @@ class apache2 {
                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/.nobackup':
                mode    => '0644',
                content => '',
@@ -141,4 +155,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'],
+       }
 }