diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-08 12:58:21 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-08 12:58:21 -0400 |
| commit | 85de5c582ffab41e94822da032b95986ba39370f (patch) | |
| tree | eb915faaad6585671101781f23077d987a0137d0 | |
| parent | 60931e1d8b25cdf99bbfdd5c9bed8f5d16709928 (diff) | |
| download | puppet-backupninja-85de5c582ffab41e94822da032b95986ba39370f.tar.gz puppet-backupninja-85de5c582ffab41e94822da032b95986ba39370f.tar.bz2 | |
Adjust $backuptag default value of handlers, removes $real_backuptag
| -rw-r--r-- | manifests/duplicity.pp | 2 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 8 | ||||
| -rw-r--r-- | manifests/rsync.pp | 9 |
3 files changed, 5 insertions, 14 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index cd54443..0ad8c2c 100644 --- a/manifests/duplicity.pp +++ b/manifests/duplicity.pp @@ -91,7 +91,7 @@ define backupninja::duplicity( $order = 90, $ssh_dir = "${destdir}/.ssh", $authorized_keys_file = 'authorized_keys', $installuser = true, - $backuptag = false, + $backuptag = "backupninja-${::fqdn}", # key options $createkey = false, $keymanage = $backupninja::keymanage ) { diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 4292c9c..9a86ae5 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -26,7 +26,7 @@ define backupninja::rdiff( "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true, $ssh_dir = "${home}/.ssh", $authorized_keys_file = 'authorized_keys', $installuser = true, $keymanage = $backupninja::keymanage, $key = false, - $backuptag = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, + $backuptag = "backupninja-${::fqdn}", $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false, $nagios_description = 'backups') { # install client dependencies @@ -37,17 +37,13 @@ define backupninja::rdiff( case $type { 'remote': { case $host { false: { err("need to define a host for remote backups!") } } - $real_backuptag = $backuptag ? { - false => "backupninja-$fqdn", - default => $backuptag - } backupninja::server::sandbox { "${user}-${name}": user => $user, host => $fqdn, dir => $home, manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key, authorized_keys_file => $authorized_keys_file, installuser => $installuser, - backuptag => $real_backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore, + backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore, nagios_description => $nagios_description } diff --git a/manifests/rsync.pp b/manifests/rsync.pp index 6f0ca74..ee49f81 100644 --- a/manifests/rsync.pp +++ b/manifests/rsync.pp @@ -5,7 +5,7 @@ define backupninja::rsync( $order = 90, $ensure = present, $user = false, $home = "/home/${user}-${name}", $host = false, $ssh_dir_manage = true, $ssh_dir = "${home}/.ssh", $authorized_keys_file = 'authorized_keys', - $installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false, + $installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = "backupninja-${::fqdn}", $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false, $nagios_description = 'backups', $subfolder = 'rsync', @@ -41,11 +41,6 @@ define backupninja::rsync( 'remote': { case $host { false: { err("need to define a host for remote backups!") } } - $real_backuptag = $backuptag ? { - false => "backupninja-$fqdn", - default => $backuptag, - } - $directory = "${home}/${subfolder}/" backupninja::server::sandbox { "${user}-${name}": @@ -57,7 +52,7 @@ define backupninja::rsync( key => $key, authorized_keys_file => $authorized_keys_file, installuser => $installuser, - backuptag => $real_backuptag, + backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore, nagios_description => $nagios_description |