Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'

Conflicts:
	manifests/dup.pp

1 files changed, 8 insertions, 3 deletions

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 1207cb1..98a74b2 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false)
+  $backuptag = false, $home = false, $backupkeytype = '')
 {
   include backupninja::client
 
@@ -35,12 +35,17 @@ define backupninja::rdiff(
     'remote': {
       case $host { false: { err("need to define a host for remote backups!") } }
       
+      $real_home = $home ? {
+        false => $directory,
+        default => $home,
+      }
+
       backupninja::server::sandbox
       {
-        "${user}-${name}": user => $user, host => $host, dir => $directory,
+        "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
-        backuptag => $backuptag
+        backuptag => $backuptag, keytype => $backupkeytype,
       }
       
       backupninja::client::key