From 6ed1f8dfe6b16f148dde641482709958bc393815 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 29 Dec 2009 17:06:26 -0200
Subject: Adding $subfolder parameter at backupninja::rdiff

New $subfolder defaulting to rdiff-backup allow configuration
of which inner folder from $home rdiff backup should keep backups.
---
 manifests/rdiff.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 38a975d..562d652 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,8 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
-  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false)
+  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false,
+  $subfolder = 'rdiff-backup')
 {
   include backupninja::client::rdiff_backup
 
@@ -41,7 +42,7 @@ define backupninja::rdiff(
         false => "/home/${user}-${name}",
         default => $home,
       }
-      $directory = "$real_home/rdiff-backup/"
+      $directory = "${real_home}/${subfolder}/"
 
       backupninja::server::sandbox
       {
-- 
cgit v1.2.3


From 24f12a74d643f44212d16f8da521ca0a50acfc86 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 17:01:16 -0300
Subject: Fixing backupninja::server::sandbox parameter on backupninja::rdiff

---
 manifests/rdiff.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index f750e23..7f51b50 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -46,7 +46,7 @@ define backupninja::rdiff(
 
       backupninja::server::sandbox
       {
-        "${user}-${name}": user => $user, host => $fqdn, dir => $real_home,
+        "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $real_backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
-- 
cgit v1.2.3


From b70a3faa51ec8be1c69d15e9bfdbedad4358447b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 17:50:00 -0300
Subject: Another change on backupninja::rdiff backuptag due to the
 introduction of backupninja_server_realize

---
 manifests/rdiff.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 7f51b50..847c319 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -34,7 +34,7 @@ define backupninja::rdiff(
     'remote': {
       case $host { false: { err("need to define a host for remote backups!") } }
       $real_backuptag = $backuptag ? {
-          false => "backupninja-$host",
+          false => "backupninja-$fqdn",
           default => $backuptag
       }
 
-- 
cgit v1.2.3