From eb06e3007ad406e5b79907513f13bd6a2a075f1f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 00:55:24 +0200 Subject: certs --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index 8daef2e..196b7fe 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -10,7 +10,6 @@ $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 } -> sunet::docker_run { "${name}_wordpress": -- cgit v1.1 From f5e307d669f27759dbeaa54d8c49785a64f7e5c5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 11:12:45 +0200 Subject: service name --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') 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}" ] -- cgit v1.1 From 08fc0687691c7b6a84889c328cd11509b7e8caad Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 22 Apr 2015 14:16:09 +0200 Subject: autobackup --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index d9eeae4..1d96d4e 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -37,5 +37,15 @@ $myqsl_version = "5.7") "MYSQL_ROOT_PASSWORD=${pwd}", "MYSQL_DATABASE=${name}"] } + package {'automysqlbackup': require => latest } -> + auges { 'automysqlbackup_settings': + incl => "/etc/default/automysqlbackup", + lens => "Shellvars.lns", + changes => [ + "set USERNAME=${name}", + "set PASSWORD=${pwd}", + "set DBHOST=${db_hostname}" + ] + } } } -- cgit v1.1 From 05092b377014dd9907bcea9b7576c23f05110626 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 22 Apr 2015 14:18:51 +0200 Subject: include --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index 1d96d4e..ac61bc9 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -5,6 +5,7 @@ $db_host = undef, $wordpress_version = "4.1.1", $myqsl_version = "5.7") { + include augeas $db_hostname = $db_host ? { undef => "${name}_mysql.docker", default => $db_host @@ -38,7 +39,7 @@ $myqsl_version = "5.7") "MYSQL_DATABASE=${name}"] } package {'automysqlbackup': require => latest } -> - auges { 'automysqlbackup_settings': + augeas { 'automysqlbackup_settings': incl => "/etc/default/automysqlbackup", lens => "Shellvars.lns", changes => [ -- cgit v1.1 From 92f00dba5b869e777d323d844d502a85d93e79cf Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 22 Apr 2015 14:19:44 +0200 Subject: bad leifj --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index ac61bc9..2335af5 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -38,7 +38,7 @@ $myqsl_version = "5.7") "MYSQL_ROOT_PASSWORD=${pwd}", "MYSQL_DATABASE=${name}"] } - package {'automysqlbackup': require => latest } -> + package {'automysqlbackup': ensure => latest } -> augeas { 'automysqlbackup_settings': incl => "/etc/default/automysqlbackup", lens => "Shellvars.lns", -- cgit v1.1 From c6be206b75642eaf63e64bfbc3bad07e9af22b33 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 22 Apr 2015 14:34:15 +0200 Subject: bad leifj --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index 2335af5..d183032 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -43,9 +43,9 @@ $myqsl_version = "5.7") incl => "/etc/default/automysqlbackup", lens => "Shellvars.lns", changes => [ - "set USERNAME=${name}", - "set PASSWORD=${pwd}", - "set DBHOST=${db_hostname}" + "set USERNAME ${name}", + "set PASSWORD ${pwd}", + "set DBHOST ${db_hostname}" ] } } -- cgit v1.1 From 3aa12a2570f187b179c8631f4eaab0c83d1662b7 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 22 Apr 2015 15:51:57 +0200 Subject: only backup the one db --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index d183032..6f6abed 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -45,7 +45,8 @@ $myqsl_version = "5.7") changes => [ "set USERNAME ${name}", "set PASSWORD ${pwd}", - "set DBHOST ${db_hostname}" + "set DBHOST ${db_hostname}", + "set DBNAMES ${name}" ] } } -- cgit v1.1