From 2132b2f78aa30ef860f2e6b152fa60dd0c151724 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 6 Mar 2015 15:51:54 +0100 Subject: fix wp --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'global/overlay') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index 75eed96..8465e79 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -12,11 +12,12 @@ $myqsl_version = "5.7") } $sanitized_name = regsubst($name, '[^0-9A-Za-z.\-]', '-', 'G') $pwd = hiera('${sanitized_name}_db_password','NOT_SET_IN_HIERA') + file {"/data/${sanitized_name}/html": ensure => directory } sunet::docker_run { name => "wordpress_${sanitized_name}", image => "wordpress", imagetag => $wordpress_version, - volumes => ["/data/${sanitized_name}/html":"/var/www/html"], + volumes => ["/data/${sanitized_name}/html:/var/www/html"], port => ["8080:80"] environment => [ "WORDPRESS_DB_HOST=${db_hostname}", "WORDPRESS_DB_USER=${sanitized_name}", @@ -25,11 +26,12 @@ $myqsl_version = "5.7") } if (!$db_host) { + file {"/data/${sanitized_name}/db": ensure => directory } sunet::docker_run { name => "mysql_${sanitized_name}", image => "mysql", imagetag => $mysql_version, - volumes => ["/data/${sanitized_name}/db":"/var/lib/mysql"], + volumes => ["/data/${sanitized_name}/db:/var/lib/mysql"], environment => ["MYSQL_USER=${sanitized_name}", "MYSQL_PASSWORD=${pwd}", "MYSQL_ROOT_PASSWORD=${pwd}", -- cgit v1.1