diff options
| author | Dennis Wallberg <dennis@nordu.net> | 2015-04-22 14:44:31 +0200 |
|---|---|---|
| committer | Dennis Wallberg <dennis@nordu.net> | 2015-04-22 14:44:31 +0200 |
| commit | 0a61b4512b9492da2f869a3950a8d3a824556fd1 (patch) | |
| tree | 9d29e40aa6d5cea30df397c5048a7468bc051c13 | |
| parent | c06ea0f096b30fdf1b83a0d9b7f72077f067b436 (diff) | |
| parent | c6be206b75642eaf63e64bfbc3bad07e9af22b33 (diff) | |
Merge branch 'master' of ssh://git.nordu.net/sunet-opssunet-ops-2015-04-22-v07
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 410b957..480eacf 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -52,9 +52,9 @@ class mailclient ($domain) { class nagioshost { - $nagios_ip_v4 = hiera('nagios_ip_v4', '109.105.111.111'), - $nagios_ip_v6 = hiera('nagios_ip_v6', '2001:948:4:6::111'), - $allowed_hosts = "${nagios_ip_v4},${nagios_ip_v6}", + $nagios_ip_v4 = hiera('nagios_ip_v4', '109.105.111.111') + $nagios_ip_v6 = hiera('nagios_ip_v6', '2001:948:4:6::111') + $allowed_hosts = "${nagios_ip_v4},${nagios_ip_v6}" package {'nagios-nrpe-server': ensure => 'installed', diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index d9eeae4..d183032 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 @@ -37,5 +38,15 @@ $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}" + ] + } } } |