complete multi-backup support by using the name in the subdirectory

diff --git a/README b/README
index a8391932917bd6c8e97aeaf8b328026be8a5c48e..94ad952762e2a28c95e2df6f30622fb029b462a4 100644 (file)
--- a/README
+++ b/README
@@ -20,6 +20,20 @@ doubled as the home for the user that was created. This caused
 problems with rdiff-backup because of dot files and other things which
 were not part of any rdiff-backup.
 
+The rdiff resource name is now used as the subdirectory where rdiff
+backups are sent. This was previously hardcoded to "rdiff-backup", but
+in order to support multiple rdiff backups per host, we now use the
+resource name. So if you were using the following resource:
+
+    backupninja::rdiff { 'main': }
+
+You will want to use the following resource:
+
+    backupninja::rdiff { 'rdiff-backup': }
+    file { '/etc/backup.d/90_main.rdiff': ensure => absent; }
+
+Otherwise your backups may be duplicated!
+
 Getting started
 ---------------
 

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 6c692c7824ea6937fae3aa3af9ba141083947f17..999eb5d8de9bb137dd2259788d61ffe9198dcf2a 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -30,7 +30,7 @@ define backupninja::rdiff(
 {
   include backupninja::client::rdiff_backup
 
-  $directory = "$home/rdiff-backup/"
+  $directory = "$home/$name/"
 
   case $type {
     'remote': {