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

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 4296ce0d1aa236485334e1395980a80018ccaa43..8fbe639ef0cb9cf0d7672103bd05829f8d57ee87 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -3,10 +3,10 @@
 
 define backupninja::rsync(
   $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,
   $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',
 
   $log = false, $partition = false, $fscheck = false, $read_only = false,
@@ -46,17 +46,12 @@ define backupninja::rsync(
         default => $backuptag,
       }
 
-      $real_home = $home ? {
-        false   => "/home/${user}-${name}",
-        default => $home,
-      }
-
-      $directory = "${real_home}/${subfolder}/"
+      $directory = "${home}/${subfolder}/"
 
       backupninja::server::sandbox { "${user}-${name}":
         user                 => $user,
         host                 => $host,
-        dir                  => $real_home,
+        dir                  => $home,
         manage_ssh_dir       => $ssh_dir_manage,
         ssh_dir              => $ssh_dir,
         key                  => $key,