Now that there's some removal of increments for old fulls, we can keep fulls for...

diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index 413a4e712c6571eb186ecf5598bec934107e5ea1..98bce1c1c543333da4e21bc74692c7eff32f6011 100644 (file)
--- 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 b58d34d80908e3e0780501292d622c788da78fd0..29fd866e62b195a8cd0afc206311aedf7e6cfff0 100644 (file)
--- 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