From 0306c8d16d0f0fe5f12c8305806cc5bcebcaed72 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 31 Jul 2008 14:03:16 +0000
Subject: enable the ability to override if the ssh directory is managed or
 not, in situations where there is a system-wide /etc/ssh/authorized_keys
 directory, this will likely not be managed by the backupninja module, and
 managing it here will result in duplicate definitions

---
 manifests/rdiff.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index a4c4c05..d015d6d 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -23,8 +23,9 @@ 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, $ssh_dir = false,
-  $authorized_keys_file = false, $installuser = true, $installkey = true, $backuptag = false)
+  $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $manage_ssh_dir = true,
+  $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
+  $backuptag = false)
 {
   include backupninja::client
   case $type {
@@ -34,8 +35,9 @@ define backupninja::rdiff(
       backupninja::server::sandbox
       {
         "${user}-${name}": user => $user, host => $host, dir => $directory,
-        ssh_dir => $ssh_dir, authorized_keys_file => $authorized_keys_file,
-        installuser => $installuser, backuptag => $backuptag
+        manage_ssh_dir => $manage_ssh_dir, ssh_dir => $ssh_dir,
+        authorized_keys_file => $authorized_keys_file, installuser => $installuser,
+        backuptag => $backuptag
       }
       
       backupninja::client::key
-- 
cgit v1.2.3