From: Paul Wise Date: Thu, 8 Sep 2016 00:55:17 +0000 (+0800) Subject: Add some HTML for disabled services to use X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7106f210104a71dd01887ad31e19eec18c512319;p=mirror%2Fdsa-puppet.git Add some HTML for disabled services to use --- diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index a2429ebda..ac46632b0 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -113,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', } @@ -122,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 => '', diff --git a/modules/apache2/templates/disabled-index.html b/modules/apache2/templates/disabled-index.html new file mode 100644 index 000000000..b9a3c720c --- /dev/null +++ b/modules/apache2/templates/disabled-index.html @@ -0,0 +1,22 @@ + + + + Welcome to <%= hostname %>! + + + +

Welcome to <%= hostname %>!

+ +This is <%= hostname %>, a system run by and for the Debian Project. +

+The service you have requested is currently disabled. +

+The reason for that and who our kind sponsors are you might learn on +db.debian.org. + +

+DSA + + +