From 85de5c582ffab41e94822da032b95986ba39370f Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Fri, 8 May 2015 12:58:21 -0400 Subject: Adjust $backuptag default value of handlers, removes $real_backuptag --- manifests/rdiff.pp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'manifests/rdiff.pp') 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 } -- cgit v1.2.3