Commit 1ad3b20e authored by Jerome Charaoui's avatar Jerome Charaoui

Adjust $home default value of the rsync handler, removes $real_home

parent e4bcc14b
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
define backupninja::rsync( define backupninja::rsync(
$order = 90, $ensure = present, $order = 90, $ensure = present,
$user = false, $home = false, $host = false, $user = false, $home = "/home/${user}-${name}", $host = false,
$ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false, $ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false,
$installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false, $installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false,
$home = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false,
$nagios_description = 'backups', $subfolder = 'rsync', $nagios_description = 'backups', $subfolder = 'rsync',
$log = false, $partition = false, $fscheck = false, $read_only = false, $log = false, $partition = false, $fscheck = false, $read_only = false,
...@@ -46,17 +46,12 @@ define backupninja::rsync( ...@@ -46,17 +46,12 @@ define backupninja::rsync(
default => $backuptag, default => $backuptag,
} }
$real_home = $home ? { $directory = "${home}/${subfolder}/"
false => "/home/${user}-${name}",
default => $home,
}
$directory = "${real_home}/${subfolder}/"
backupninja::server::sandbox { "${user}-${name}": backupninja::server::sandbox { "${user}-${name}":
user => $user, user => $user,
host => $host, host => $host,
dir => $real_home, dir => $home,
manage_ssh_dir => $ssh_dir_manage, manage_ssh_dir => $ssh_dir_manage,
ssh_dir => $ssh_dir, ssh_dir => $ssh_dir,
key => $key, key => $key,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment