Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-26-v01

1 files changed, 14 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 8daef2e..6f6abed 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -5,12 +5,12 @@ $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
    }
    $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":
@@ -18,7 +18,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}" ]
@@ -37,5 +38,16 @@ $myqsl_version     = "5.7")
                           "MYSQL_ROOT_PASSWORD=${pwd}",
                           "MYSQL_DATABASE=${name}"]
       }
+      package {'automysqlbackup': ensure => latest } -> 
+      augeas { 'automysqlbackup_settings': 
+         incl    => "/etc/default/automysqlbackup",
+         lens    => "Shellvars.lns",
+         changes => [
+            "set USERNAME ${name}",
+            "set PASSWORD ${pwd}",
+            "set DBHOST ${db_hostname}",
+            "set DBNAMES ${name}"
+         ]
+      }
    }
 }