From 7f9dfc2720855047ffada44ed914fc3b30a41079 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 21 Oct 2019 11:42:29 +0200
Subject: [PATCH] Parameterize webserver class

---
 data/common.yaml                           |  1 +
 modules/webserver/manifests/defaultpage.pp | 26 +++++++++++++---------
 modules/webserver/manifests/init.pp        |  3 ++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index 11973469f..4cc1d2029 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -32,6 +32,7 @@ roles::dns_primary::allow_access:
   - '2a01:3f0:0:28::25'
 postgres::backup_cluster::db_backup_role: 'debian-backup'
 postgres::backup_server::globals::backup_unix_user: 'debbackup'
+webserver::defaultpage::defaultdomain: 'default.debian.org'
 # bacula
 #
 bacula::email_all: 'bacula-reports@admin.debian.org'
diff --git a/modules/webserver/manifests/defaultpage.pp b/modules/webserver/manifests/defaultpage.pp
index 29c7e05d6..0d6d8953a 100644
--- a/modules/webserver/manifests/defaultpage.pp
+++ b/modules/webserver/manifests/defaultpage.pp
@@ -1,15 +1,19 @@
+# Install default website content
 #
-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',
-	}
+# @param defaultdomain domain name of the default page, to create directory under /srv/www
+class webserver::defaultpage (
+  String $defaultdomain,
+) {
+  file { [ '/srv/www', "/srv/www/${defaultdomain}", "/srv/www/${defaultdomain}/htdocs", "/srv/www/${defaultdomain}/htdocs-disabled" ]:
+    ensure => directory,
+    mode   => '0755',
+  }
 
-	file { '/srv/www/default.debian.org/htdocs/index.html':
-		content => template('webserver/default-index.html'),
-	}
+  file { "/srv/www/${defaultdomain}/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'),
-	}
+  file { "/srv/www/${defaultdomain}/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 e5b91401b..1a7844a0b 100644
--- a/modules/webserver/manifests/init.pp
+++ b/modules/webserver/manifests/init.pp
@@ -1,4 +1,5 @@
+# base webserver class.  Currently only ships a default page
 #
 class webserver {
-	include webserver::defaultpage
+  include webserver::defaultpage
 }
-- 
2.20.1