aboutsummaryrefslogtreecommitdiff
path: root/handlers
diff options
context:
space:
mode:
authorOlivier Berger <oberger@ouvaton.org>2010-11-14 14:58:15 +0100
committerOlivier Berger <oberger@ouvaton.org>2011-04-25 22:40:44 +0200
commitca14175210a0f12ef4802f057d07530a989e82f7 (patch)
tree3bc6250147cc11335f0f982e945b4a248d532827 /handlers
parent573e803a07b81328bcc64a2cb08bab1831cc94a7 (diff)
downloadbackupninja-ca14175210a0f12ef4802f057d07530a989e82f7.tar.gz
backupninja-ca14175210a0f12ef4802f057d07530a989e82f7.tar.bz2
Now that there's some removal of increments for old fulls, we can keep fulls for a longer time, for instance 1Y which becomes default
Diffstat (limited to 'handlers')
-rw-r--r--handlers/dup.helper.in4
-rw-r--r--handlers/dup.in5
2 files changed, 7 insertions, 2 deletions
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index 413a4e7..98bce1c 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -419,10 +419,10 @@ incremental = $dup_incremental
#increments = keep
increments = $dup_increments
-# how many days of data to keep ; default is 60 days.
+# how many days of data to keep ; default is 1 year.
# (you can also use the time format of duplicity)
# 'keep = yes' means : do not delete old data, the remote host will take care of this
-#keep = 60
+#keep = 1Y
#keep = yes
keep = $dup_keep
diff --git a/handlers/dup.in b/handlers/dup.in
index b58d34d..29fd866 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -25,8 +25,13 @@ getconf exclude
setsection dest
getconf incremental yes
getconf increments 30
+<<<<<<< HEAD
getconf keep 60
getconf keepincroffulls all
+=======
+getconf keep 1Y
+getconf keepincroffulls 6
+>>>>>>> Now that there's some removal of increments for old fulls, we can keep fulls for a longer time, for instance 1Y which becomes default
getconf desturl
getconf awsaccesskeyid
getconf awssecretaccesskey