summaryrefslogtreecommitdiff
path: root/global/overlay/etc
diff options
context:
space:
mode:
Diffstat (limited to 'global/overlay/etc')
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml3
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp7
2 files changed, 9 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 396a110..37dcdbf 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -48,3 +48,6 @@ www2.eduid.se:
webappserver:
'^web-f[0-9]+\.sunet\.se$':
webfrontend:
+web-a1.sunet.se:
+ sunet::wordpress:
+ name: www.sunet.se
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
index 25fba72..dc44a56 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -1,6 +1,11 @@
# a basic wp setup using docker
-define sunet::wordpress ($name => undef, $wordpress_version => "4.1.1", $myqsl_version="5.7", $db_host => undef) {
+define sunet::wordpress (
+$name = undef,
+$db_host = undef,
+$wordpress_version = "4.1.1",
+$myqsl_version = "5.7")
+{
$db_hostname = $db_host ? $db_host : "mysql_${sanitized_name}.docker"
$sanitized_name = regsubst($name, '[^0-9A-Za-z.\-]', '-', 'G')
$pwd = hiera('${sanitized_name}_db_password','NOT_SET_IN_HIERA')