From ea5cf965fc63ba39507de5e68f39563b87b7f0bc Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 7 Mar 2013 13:30:16 +0100
Subject: declare $directory not only if $type is 'remote'

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

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 587c02d..36ba4e5 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -37,12 +37,6 @@ define backupninja::rdiff(
           default => $backuptag
       }
 
-      $real_home = $home ? {
-        false => "/home/${user}-${name}",
-        default => $home,
-      }
-      $directory = "$real_home/rdiff-backup/"
-
       backupninja::server::sandbox
       {
         "${user}-${name}": user => $user, host => $fqdn, dir => $real_home,
@@ -61,6 +55,13 @@ define backupninja::rdiff(
       }
     }
   }
+
+  $real_home = $home ? {
+    false => "/home/${user}-${name}",
+    default => $home,
+  }
+    $directory = "$real_home/rdiff-backup/"
+
   file { "${backupninja::client::defaults::configdir}/${order}_${name}.rdiff":
     ensure => $ensure,
     content => template('backupninja/rdiff.conf.erb'),
-- 
cgit v1.2.3


From 5b8e7c591888d9601880a800da94728f163f7155 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 20 Apr 2013 15:44:16 +0200
Subject: real_home is a leftover from former times

---
 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 36ba4e5..63029d2 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -39,7 +39,7 @@ define backupninja::rdiff(
 
       backupninja::server::sandbox
       {
-        "${user}-${name}": user => $user, host => $fqdn, dir => $real_home,
+        "${user}-${name}": user => $user, host => $fqdn, dir => $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 a12279a44c986325751b1a978919c16de844c57a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 20 Apr 2013 16:24:30 +0200
Subject: default parameter for $home moved to define parameter

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

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 63029d2..a60f9ca 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -16,7 +16,8 @@
 #      directories.
 # 
 define backupninja::rdiff(
-  $order = 90, $ensure = present, $user = false, $home = false, $host = false,
+  $order = 90, $ensure = present, $user = false,
+  $home = "/home/${user}-${name}", $host = false,
   $type = 'local',
   $exclude = [ "/home/*/.gnupg", "/home/*/.local/share/Trash", "/home/*/.Trash",
                "/home/*/.thumbnails", "/home/*/.beagle", "/home/*/.aMule",
@@ -29,6 +30,8 @@ define backupninja::rdiff(
 {
   include backupninja::client::rdiff_backup
 
+  $directory = "$real_home/rdiff-backup/"
+
   case $type {
     'remote': {
       case $host { false: { err("need to define a host for remote backups!") } }
@@ -56,11 +59,6 @@ define backupninja::rdiff(
     }
   }
 
-  $real_home = $home ? {
-    false => "/home/${user}-${name}",
-    default => $home,
-  }
-    $directory = "$real_home/rdiff-backup/"
 
   file { "${backupninja::client::defaults::configdir}/${order}_${name}.rdiff":
     ensure => $ensure,
-- 
cgit v1.2.3


From ea228f2231761cfb404c2bebd4862ca26b132d95 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 20 Apr 2013 16:42:12 +0200
Subject: fix $directory

---
 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 a60f9ca..0156f12 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -30,7 +30,7 @@ define backupninja::rdiff(
 {
   include backupninja::client::rdiff_backup
 
-  $directory = "$real_home/rdiff-backup/"
+  $directory = "$home/rdiff-backup/"
 
   case $type {
     'remote': {
-- 
cgit v1.2.3