summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRaphael Geissert <geissert@debian.org>2012-12-14 14:36:54 -0600
committerSimon Paillard <spaillard@debian.org>2013-05-01 01:23:16 +0200
commit8d734b614f2f6a33f71cc0758ac146804952b0c4 (patch)
treecd3621ee4a4da932ad2fc2ee253788ce81b0e655 /etc
parent3dd8920d9f8ca9b868f01fb136e9eb5d3bade338 (diff)
Add RSYNC_DELETE_METHOD option to make it easier to use --delete-delay
If RSYNC_OPTIONS2 hasn't been modified, this will result in --delete-delay being used if rsync 3.0.0 or greater is used. Signed-off-by: Raphael Geissert <geissert@debian.org>
Diffstat (limited to 'etc')
-rw-r--r--etc/ftpsync.conf.sample8
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample
index 4d96efb..3a8abe0 100644
--- a/etc/ftpsync.conf.sample
+++ b/etc/ftpsync.conf.sample
@@ -124,6 +124,12 @@
## limit I/O bandwidth. Value is KBytes per second, unset or 0 means unlimited
#RSYNC_BW=""
+## Method used to delete files: "delay" or "after". "delay" is
+## recommended and is the default if no value is set and rsync 3 is
+## detected. NOTE: for this to work, neither --delete-after nor
+## --delete-delay should be set in RSYNC_OPTIONS2 (below).
+#RSYNC_DELETE_METHOD=""
+
## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T!
## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T!
## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T!
@@ -144,7 +150,7 @@
## Options the second pass gets. Now we want the Packages/Source indices too
## and we also want to delete files. We also want to delete files that are
## excluded.
-#RSYNC_OPTIONS2="--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded"
+#RSYNC_OPTIONS2="--max-delete=40000 --delay-updates --delete --delete-excluded"
## You may establish the connection via a web proxy by setting the environment
## variable RSYNC_PROXY to a hostname:port pair pointing to your web proxy. Note