From: Peter Palfrader Date: Tue, 26 May 2009 21:27:56 +0000 (+0200) Subject: mv templates/default-index.html modules/apache2/templates/ X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=decd3e64711387f9fab4ef6fcfbdf1e6e43745af;p=dsa-puppet.git mv templates/default-index.html modules/apache2/templates/ --- diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 29753045..706d40e1 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -31,7 +31,7 @@ class apache2 { mode => 755, ensure => directory; "/srv/www/default.debian.org/htdocs/index.html": - content => template("default-index.html"); + content => template("apache2/default-index.html"); "/var/log/apache2": mode => 755, diff --git a/modules/apache2/templates/default-index.html b/modules/apache2/templates/default-index.html new file mode 100644 index 00000000..f19c5043 --- /dev/null +++ b/modules/apache2/templates/default-index.html @@ -0,0 +1,32 @@ + + + + Welcome to <%= hostname %>! + + + +

Welcome to <%= hostname %>!

+ +This is <%= hostname %>, a system run by and for the Debian Project. +She does stuff. +What kind of stuff and who our kind sponsors are you might learn on +db.debian.org. +<% if hostname == "saens" -%> +

+This host used to be ftp.debian.org (just another +mirror, not the master site - that is ftp-master.debian.org) a long +time ago. +

+As of May 2009 it is part of security(.us).debian.org, +serving the security archive. +

+For a list of mirrors of the main debian archive please visit the +Debian website at http://www.debian.org/mirror/list. +<% end -%> + +

+

+DSA + + + diff --git a/templates/default-index.html b/templates/default-index.html deleted file mode 100644 index f19c5043..00000000 --- a/templates/default-index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - Welcome to <%= hostname %>! - - - -

Welcome to <%= hostname %>!

- -This is <%= hostname %>, a system run by and for the Debian Project. -She does stuff. -What kind of stuff and who our kind sponsors are you might learn on -db.debian.org. -<% if hostname == "saens" -%> -

-This host used to be ftp.debian.org (just another -mirror, not the master site - that is ftp-master.debian.org) a long -time ago. -

-As of May 2009 it is part of security(.us).debian.org, -serving the security archive. -

-For a list of mirrors of the main debian archive please visit the -Debian website at http://www.debian.org/mirror/list. -<% end -%> - -

-

-DSA - - -