Merge branch 'multi-backup'

Conflicts:
	README

See merge request !5

1 files changed, 28 insertions, 5 deletions

diff --git a/README b/README
index f459061..e8cef4d 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ backupninja!
 
 If you were previously using this module, some pieces have changed,
 and you need to carefully change your use of them, or you will find
-your backups could stop working.
+your backups could stop working or get duplicated.
 
 The backupninja::client class has been renamed to backupninja, and is
 now *required* in all node manifests. Make sure the backupninja class
@@ -24,12 +24,35 @@ $nagios_server. The $manage_nagios parameter also replaces the
 $use_nagios global.
 
 As for handlers, they don't include the backupninja::client anymore and
-now read several default values from the backupninja base class. Most
-handler declarations shouldn't need any changes.
+now read several default values from the backupninja base class. If you
+were using the rdiff-backup handler, read the following section
+carefully. Other handlers have not changed in any significant way.
 
-See below for dependencies which have been introduced in this version.
+Changes to the rdiff-backup handler
+-----------------------------------
 
-Dependencies
+You will need to make sure you change all of your "$directory"
+parameters to be "$home" instead, and on your backupserver you will need
+to move all of your backups into "$home"/rdiff-backup. Previously, they
+were put in "$directory", which 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
 ---------------
 
 This module requires Puppet versions 2.7 and up.