projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25a85a8)
Add some HTML for disabled services to use
authorPaul Wise <pabs@debian.org>
Thu, 8 Sep 2016 00:55:17 +0000 (08:55 +0800)
committerPaul Wise <pabs@debian.org>
Thu, 8 Sep 2016 00:55:17 +0000 (08:55 +0800)
modules/apache2/manifests/init.pp patch | blob | history
modules/apache2/templates/disabled-index.html [new file with mode: 0644] patch | blob

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a2429eb..ac46632 100644 (file)
--- 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 (file)
index 0000000..b9a3c72
--- /dev/null
+++ b/modules/apache2/templates/disabled-index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+<HEAD>
+   <TITLE>Welcome to <%= hostname %>!</TITLE>
+</HEAD>
+<BODY>
+
+<H1>Welcome to <%= hostname %>!</H1>
+
+This is <%= hostname %>, a system run by and for the <a href="https://www.debian.org/">Debian Project</a>.
+<P>
+The service you have requested is currently disabled.
+<P>
+The reason for that and who our kind sponsors are you might learn on
+<a href="https://db.debian.org/machines.cgi?host=<%= hostname %>">db.debian.org</a>.
+
+<P>
+<HR NOSHADE />
+<FONT size="-1">DSA</FONT>
+
+</BODY>
+</HTML>
Unnamed repository; edit this file 'description' to name the repository.