allow for a resource override of managing the ssh directory

diff --git a/manifests/client.pp b/manifests/client.pp
index 6f48b22c80561672020e3dd6e239718657f85830..c9193c91619c4291e6348d7d022a8699ed4d7aa1 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -27,6 +27,10 @@ class backupninja::client {
     '' => true,
     default => $keymanage
   }
+  $real_ssh_dir_manage = $ssh_dir_manage ? {
+    '' => true,
+    default => $ssh_dir_manage
+  }
   package { 'backupninja':
     ensure => '0.9.5-3';
   }

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index d015d6db1b3dccf9240f2ae1b5efa67c431f5fe3..e3964d03222b9c919efaadb737010eb68e9eadce 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -23,7 +23,7 @@ define backupninja::rdiff(
                "/home/*/gtk-gnutella-downloads" ],
   $include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root",
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
-  $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $manage_ssh_dir = true,
+  $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)
 {
@@ -35,7 +35,7 @@ define backupninja::rdiff(
       backupninja::server::sandbox
       {
         "${user}-${name}": user => $user, host => $host, dir => $directory,
-        manage_ssh_dir => $manage_ssh_dir, ssh_dir => $ssh_dir,
+        manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $backuptag
       }