From: intrigeri <intrigeri@boum.org>
Date: Mon, 10 May 2010 20:15:41 +0000 (+0200)
Subject: Store duplicity cache to /var/cache/backupninja/duplicity.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d6ec2b4e62d1de94cf731381d7da934b6fee7ddc;p=backupninja.git

Store duplicity cache to /var/cache/backupninja/duplicity.

... instead of previous /var/backups/duplicity.
---

diff --git a/ChangeLog b/ChangeLog
index 26cac5c..c9a8d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,8 @@ version 0.9.8 -- UNRELEASED
 	   0.6.01 or newer, that depends on local caching (Closes: #572721)
 	 . Ignore anything but digits and "." when comparing versions
 	   (Closes: #578987)
-	 . Put archive directory (cache) into /var/backups/duplicity rather
-	   than the default /root/.cache/duplicity, unless the user
+	 . Put archive directory (cache) into /var/cache/backupninja/duplicity
+	   rather than the default /root/.cache/duplicity, unless the user
 	   has specified it (Closes: 580213)
 	 . Better example.dup documentation. Thanks, Alster!
 	 . Added ftp_password option to securely transmit the FTP password
diff --git a/NEWS b/NEWS
index 50739f4..0ec3a81 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ backupninja (0.9.8-1) UNRELEASED
 	* duplicity 0.6.01 and later defaults to using an archive (cache)
 	  directory, which was previously opt-in. Starting with backupninja
 	  0.9.8, the backupninja duplicity handler puts this cache into
-	  /var/backups/duplicity unless specified by the user with the "options"
-	  setting the *.dup job.
+	  /var/cache/backupninja/duplicity unless specified by the user with
+	  the "options" setting the *.dup job.
 	  When backups have been performed with backupninja older than 0.9.8 in
 	  conjunction with duplicity 0.6.01 or later, e.g. when using Sid or
 	  Squeeze at certain times of the Squeeze release cycle, cache files
@@ -12,7 +12,8 @@ backupninja (0.9.8-1) UNRELEASED
 	  delete these files, or rather save bandwidth and just move the cache
 	  directory to the new location:
 
-	             mv /root/.cache/duplicity /var/backups/
+	             mkdir -p /var/cache/backupninja
+	             mv /root/.cache/duplicity /var/cache/backupninja/
 
 backupninja (0.9.7-1) UNRELEASED
 
diff --git a/handlers/dup.in b/handlers/dup.in
index 4e0bbcf..5216643 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -198,11 +198,11 @@ if [ -n "$tmpdir" ]; then
 fi
 
 ### Archive directory
-# duplicity >= 0.6.01 enables the archive_dir by default, let's put it into /var/backups
+# duplicity >= 0.6.01 enables the archive_dir by default, let's put it into /var/cache/backupninja/duplicity
 # unless the user has specified it.
 if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 1 ]; then
    if echo "${options}" | grep -qv -- "--archive-dir" ; then
-      execstr_options="${execstr_options} --archive-dir /var/backups/duplicity"
+      execstr_options="${execstr_options} --archive-dir /var/cache/backupninja/duplicity"
    fi
 fi