Adding missing keystore and backupkeystore parameters at rdiff and dup definitions

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 6e0330ab46981b0bac54ac9815ea1138f5b63929..dc597f73e2483851ff3b5e294302dd3a230f2fa4 100644 (file)
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -116,6 +116,7 @@ define backupninja::duplicity( $order  = 90,
     host       => $desthost,
     installkey => $installkey,
     keytype    => $backupkeytype,
+    keystore   => $backupkeystore,
   }
 
   # the backupninja rule for this duplicity backup

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index f810357c3c1a77b08b5c91052d26e566623ab122..b32a26243b2dae57c7de93f4a3f12278805779e9 100644 (file)
--- 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, $home = false, $backupkeytype = "rsa")
+  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false)
 {
   include backupninja::client::defaults
 
@@ -45,7 +45,7 @@ define backupninja::rdiff(
         "${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, keytype => $backupkeytype,
+        backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
       }
      
       backupninja::client::key
@@ -53,6 +53,7 @@ define backupninja::rdiff(
         "${user}-${name}": user => $user, host => $host,
         installkey => $installkey,
         keytype => $backupkeytype,
+        keystore => $backupkeystore,
       }
     }
   }