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

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

diff --git a/ChangeLog b/ChangeLog
index 26cac5ca5cc1283a61d7dcb98d20a63b8cdcb2b8..c9a8d43ea83c624f86d3f488b22969a612ee5152 100644 (file)
--- 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 50739f4597910075eb7456969431a2fbb3051349..0ec3a81a4e99837bba72f058bb64e88ed8e1f700 100644 (file)
--- 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 4e0bbcf46adeabb4ee5e3ad55a8eff3e83c41f77..52166433f05507c65585397992f09a46b2402bf6 100644 (file)
--- 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