From b91a5259d4a854579c072680872b02b9e9b6970a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 30 May 2008 18:03:32 +0000
Subject: change from installkeys to installkey when you have two rdiff-backup
 calls, then the User is a Duplicate definition, i think the only way to do it
 is to have a variable that you can set to turn off user handling (which we
 make $installuser and $usermanage be consistant with $installkey and
 $keymanage), which is set true by default, but when you have a second rdiff
 call on a host, you can set it to false

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

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index aec4d96..978b961 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -26,14 +26,15 @@ define backupninja::rdiff($order = 90,
                            $keep = 30,
                            $sshoptions = false,
                            $options = false,
-                           $installkeys = true
+                           $installuser = true,
+                           $installkey = true
                           ) {
 	include backupninja::client
 	case $type {
 	        'remote': {
 			case $host { false: { err("need to define a host for remote backups!") } }
-		        backupninja::server::sandbox { "${user}-${name}": user => $user, host => $host, dir => $directory }
-                        backupninja::client::key { "${user}-${name}": user => $user, host => $host, installkeys => $installkeys }
+		        backupninja::server::sandbox { "${user}-${name}": user => $user, host => $host, dir => $directory, installuser => $installuser }
+                        backupninja::client::key { "${user}-${name}": user => $user, host => $host, installkey => $installkey }
 		}
 	}
 	file { "${backupninja::client::configdir}/${order}_${name}.rdiff":
-- 
cgit v1.2.3