From ee50413dba7592c694412fb3c23bdfa59d7c7fea Mon Sep 17 00:00:00 2001 From: Grant Davies Date: Thu, 30 May 2019 15:57:58 +1000 Subject: [PATCH 1/4] Add option to specify $backupdir as a symlink target, for use with dm_crypt encrypted partitions. --- manifests/backup/mysqldump.pp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp index 4f0895cbc..bb2482728 100644 --- a/manifests/backup/mysqldump.pp +++ b/manifests/backup/mysqldump.pp @@ -25,6 +25,8 @@ $postscript = false, $execpath = '/usr/bin:/usr/sbin:/bin:/sbin', $optional_args = [], + $mysqlbackupdir_ensure = 'directory', + $mysqlbackupdir_target = undef, ) inherits mysql::params { if $backupcompress { @@ -70,10 +72,20 @@ content => template('mysql/mysqlbackup.sh.erb'), } - file { $backupdir: - ensure => 'directory', - mode => $backupdirmode, - owner => $backupdirowner, - group => $backupdirgroup, + if $mysqlbackupdir_target { + file { $backupdir: + ensure => $mysqlbackupdir_ensure, + target => $mysqlbackupdir_target, + mode => $backupdirmode, + owner => $backupdirowner, + group => $backupdirgroup, + } else { + file { $backupdir: + ensure => $mysqlbackupdir_ensure, + mode => $backupdirmode, + owner => $backupdirowner, + group => $backupdirgroup, + } } + } From 2aed1e14e49204fb27454d75245bfba8574bed47 Mon Sep 17 00:00:00 2001 From: Grant Davies Date: Thu, 30 May 2019 16:04:35 +1000 Subject: [PATCH 2/4] Add option to specify $backupdir as a symlink target, for use with dm_crypt encrypted partitions. Fixed syntax for elsif --- manifests/backup/mysqldump.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp index bb2482728..1b31a0209 100644 --- a/manifests/backup/mysqldump.pp +++ b/manifests/backup/mysqldump.pp @@ -79,7 +79,7 @@ mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, - } else { + } elsif { file { $backupdir: ensure => $mysqlbackupdir_ensure, mode => $backupdirmode, From 9c0e55fdfc094a9b6f4bfc2f70081359d58ccfea Mon Sep 17 00:00:00 2001 From: Grant Davies Date: Thu, 30 May 2019 16:16:37 +1000 Subject: [PATCH 3/4] Add option to specify $backupdir as a symlink target, for use with dm_crypt encrypted partitions. --- manifests/backup/mysqldump.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp index 1b31a0209..0a3e84975 100644 --- a/manifests/backup/mysqldump.pp +++ b/manifests/backup/mysqldump.pp @@ -72,14 +72,15 @@ content => template('mysql/mysqlbackup.sh.erb'), } - if $mysqlbackupdir_target { + if $mysqlbackupdir_target != undef { file { $backupdir: ensure => $mysqlbackupdir_ensure, target => $mysqlbackupdir_target, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, - } elsif { + } + else { file { $backupdir: ensure => $mysqlbackupdir_ensure, mode => $backupdirmode, From 17bd04a0ee3e042a83c99edd60702741215eab55 Mon Sep 17 00:00:00 2001 From: Grant Davies Date: Thu, 30 May 2019 16:18:10 +1000 Subject: [PATCH 4/4] Add option to specify $backupdir as a symlink target, for use with dm_crypt encrypted partitions. --- manifests/backup/mysqldump.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp index 0a3e84975..465172b3d 100644 --- a/manifests/backup/mysqldump.pp +++ b/manifests/backup/mysqldump.pp @@ -72,7 +72,7 @@ content => template('mysql/mysqlbackup.sh.erb'), } - if $mysqlbackupdir_target != undef { + if $mysqlbackupdir_target { file { $backupdir: ensure => $mysqlbackupdir_ensure, target => $mysqlbackupdir_target, @@ -80,7 +80,7 @@ owner => $backupdirowner, group => $backupdirgroup, } - else { + } else { file { $backupdir: ensure => $mysqlbackupdir_ensure, mode => $backupdirmode,