From 738ce8961d5cf4560c44a2ebacfeef0bef5f6be1 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 19 Aug 2018 11:43:10 +0200
Subject: [PATCH] Move default webpage from apache to webserver module

---
 modules/apache2/manifests/init.pp                 | 13 -------------
 modules/webserver/manifests/defaultpage.pp        | 15 +++++++++++++++
 modules/webserver/manifests/init.pp               |  2 ++
 .../templates/default-index.html                  |  0
 .../templates/disabled-index.html                 |  0
 5 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 modules/webserver/manifests/defaultpage.pp
 rename modules/{apache2 => webserver}/templates/default-index.html (100%)
 rename modules/{apache2 => webserver}/templates/disabled-index.html (100%)

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ce7c9273b..d20039104 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -119,19 +119,6 @@ class apache2 {
 		source => 'puppet:///modules/apache2/apache2.logrotate',
 	}
 
-	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',
-	}
-
-	file { '/srv/www/default.debian.org/htdocs/index.html':
-		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':
 		ensure => directory,
 		mode   => '0755',
diff --git a/modules/webserver/manifests/defaultpage.pp b/modules/webserver/manifests/defaultpage.pp
new file mode 100644
index 000000000..29c7e05d6
--- /dev/null
+++ b/modules/webserver/manifests/defaultpage.pp
@@ -0,0 +1,15 @@
+#
+class webserver::defaultpage {
+	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',
+	}
+
+	file { '/srv/www/default.debian.org/htdocs/index.html':
+		content => template('webserver/default-index.html'),
+	}
+
+	file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
+		content => template('webserver/disabled-index.html'),
+	}
+}
diff --git a/modules/webserver/manifests/init.pp b/modules/webserver/manifests/init.pp
index 6ffcfaaf6..f73f8dffe 100644
--- a/modules/webserver/manifests/init.pp
+++ b/modules/webserver/manifests/init.pp
@@ -1,5 +1,7 @@
 #
 class webserver {
+	include webserver::defaultpage
+
 	file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
 	concat::fragment { 'dsa-puppet-stuff--webserver-export-shutdown':
 		target => '/etc/cron.d/dsa-puppet-stuff',
diff --git a/modules/apache2/templates/default-index.html b/modules/webserver/templates/default-index.html
similarity index 100%
rename from modules/apache2/templates/default-index.html
rename to modules/webserver/templates/default-index.html
diff --git a/modules/apache2/templates/disabled-index.html b/modules/webserver/templates/disabled-index.html
similarity index 100%
rename from modules/apache2/templates/disabled-index.html
rename to modules/webserver/templates/disabled-index.html
-- 
2.20.1