summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/modules/sunet
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-04-17 14:25:53 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-04-17 14:25:53 +0200
commitcd87a440cfef2e18993c25c5aa3b6064ba6c33cb (patch)
tree8e7f256494f1bd053e5129591ace54e5d49d1055 /global/overlay/etc/puppet/modules/sunet
parentfd1987317642b920286c3088540c8b00cae3bd88 (diff)
parent120010e02911902aab51db07f60fcfb554f96d62 (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-17-v21
Diffstat (limited to 'global/overlay/etc/puppet/modules/sunet')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
index 196b7fe..d9eeae4 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -17,7 +17,8 @@ $myqsl_version = "5.7")
imagetag => $wordpress_version,
volumes => ["/data/${name}/html:/var/www/html"],
ports => ["8080:80"],
- env => [ "WORDPRESS_DB_HOST=${db_hostname}",
+ env => [ "SERVICE_NAME=${name}",
+ "WORDPRESS_DB_HOST=${db_hostname}",
"WORDPRESS_DB_USER=${name}",
"WORDPRESS_DB_NAME=${name}",
"WORDPRESS_DB_PASSWORD=${pwd}" ]