fix backupninja rdiff server sandbox to enable multiple rdiff definitions differentiated

by their name variable

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 6249086b6f0ad89cd4777e32ab8dfeded216532f..02f72e67ea0b732fc2d36ef85b4fc1a134450812 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -31,7 +31,7 @@ define backupninja::rdiff($order = 90,
        case $type {
                'remote': {
                        case $host { false: { err("need to define a host for remote backups!") } }
-                       backupninja::server::sandbox { $user: host => $host, dir => $directory }
+                       backupninja::server::sandbox { $user-$name: user => $user, host => $host, dir => $directory }
                         backupninja::client::key { $user: }
                }
        }

diff --git a/manifests/server.pp b/manifests/server.pp
index c08b33d949063cf21f1c3e52cd39e08a4f213009..dbeeca09378cb12b62ab0d0201000f234dcecbd2 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -20,7 +20,12 @@ class backupninja::server {
 
   # this define allows nodes to declare a remote backup sandbox, that have to
   # get created on the server
-  define sandbox($host = false, $dir = false, $backupkeys = false, $uid = false, $gid = "backupninjas") {
+  define sandbox($user = false, $host = false, $dir = false, $backupkeys = false, $uid = false, $gid = "backupninjas") {
+    $real_user = $name ? {
+      false => $name,
+      default => $user,
+      '' => $name,
+    }
     $real_host = $host ? {
       false => $fqdn,
       default => $host,