From fb1edaa751d0ec5adac2678660929f808df5f9ab Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 6 Mar 2015 16:27:05 +0100
Subject: fix wp

---
 global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'global/overlay/etc')

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,
-- 
cgit v1.1