summaryrefslogtreecommitdiff
path: root/global/overlay
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-03-06 16:27:05 +0100
committerLeif Johansson <leifj@sunet.se>2015-03-06 16:27:05 +0100
commitfb1edaa751d0ec5adac2678660929f808df5f9ab (patch)
tree783c0e22dad83a6f17c69364fcb1512b4503cda6 /global/overlay
parentcd5575ad0bfbb1810480669db28c35c37b511296 (diff)
Diffstat (limited to 'global/overlay')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp8
1 files changed, 5 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
index 72d43aa..fe89090 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -10,9 +10,9 @@ $myqsl_version = "5.7")
default => $db_host
}
$pwd = hiera("${name}_db_password",'NOT_SET_IN_HIERA')
- file {"/data": ensure => directory }
- file {"/data/${name}": ensure => directory }
- file {"/data/${name}/html": ensure => directory }
+ file {"/data": ensure => directory } ->
+ file {"/data/${name}": ensure => directory } ->
+ file {"/data/${name}/html": ensure => directory } ->
sunet::docker_run { "${name}_wordpress":
image => "wordpress",
imagetag => $wordpress_version,
@@ -26,6 +26,8 @@ $myqsl_version = "5.7")
if (!$db_host) {
file {"/data/${name}/db": ensure => directory }
+ group { 'mysql': ensure => 'present' } ->
+ user { 'mysql': ensure => 'present', groups => 'mysql' } ->
sunet::docker_run { "${name}_mysql":
image => "mysql",
imagetag => $mysql_version,