summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-03-06 16:03:11 +0100
committerLeif Johansson <leifj@sunet.se>2015-03-06 16:03:11 +0100
commit03e0df71b46505b64fcf5cf67a92bd08bfab166d (patch)
tree6c20b81b94a52a4d638f38fb052a7e20cafd363b /global
parent0d1fb015ba8d58cfd52cfcf6d5998fe82916ea2c (diff)
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
index f2ba631..b0fce47 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -16,7 +16,7 @@ $myqsl_version = "5.7")
imagetag => $wordpress_version,
volumes => ["/data/${name}/html:/var/www/html"],
ports => ["8080:80"],
- environment => [ "WORDPRESS_DB_HOST=${db_hostname}",
+ env => [ "WORDPRESS_DB_HOST=${db_hostname}",
"WORDPRESS_DB_USER=${name}",
"WORDPRESS_DB_NAME=${name}",
"WORDPRESS_DB_PASSWORD=${pwd}" ]
@@ -28,7 +28,7 @@ $myqsl_version = "5.7")
image => "mysql",
imagetag => $mysql_version,
volumes => ["/data/${name}/db:/var/lib/mysql"],
- environment => ["MYSQL_USER=${name}",
+ env => ["MYSQL_USER=${name}",
"MYSQL_PASSWORD=${pwd}",
"MYSQL_ROOT_PASSWORD=${pwd}",
"MYSQL_DATABASE=${name}"]