summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Geissert <geissert@debian.org>2012-12-17 19:48:09 -0600
committerRaphael Geissert <geissert@debian.org>2012-12-17 19:48:09 -0600
commite1e7735ca02767d458b7b3cafae76c6dd844fc94 (patch)
treecbb4d9fc090fe286a7afc7815a19e72ba61929df
parent06eaf830798e52862d0b47cdbae98693f57f9c89 (diff)
Sync sample config file options with that of the binary
This also ensures that even if RSYNC_OPTIONS is uncommented in the config file, the trace, lock, and sync flag files are never removed. The use of the exclude filter, could result in unexpected behaviour due to the removal of the Update-Required flag file, and some temporary 404s that have been seen by http.debian.net. Signed-off-by: Raphael Geissert <geissert@debian.org>
-rw-r--r--etc/ftpsync.conf.sample7
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample
index 31c1758..4d96efb 100644
--- a/etc/ftpsync.conf.sample
+++ b/etc/ftpsync.conf.sample
@@ -129,8 +129,13 @@
## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T!
## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T!
+## Files that must *never* be deleted by rsync. These are files handled
+## internally by ftpsync and will be created, updated, and deleted when
+## appropriate.
+#RSYNC_FILTER="--filter=protect_Archive-Update-in-Progress-${MIRRORNAME} --filter=protect_${TRACE} --filter=protect_Archive-Update-Required-${MIRRORNAME}"
+
## Default rsync options every rsync invocation sees.
-#RSYNC_OPTIONS="-prltvHSB8192 --timeout 3600 --stats --exclude=Archive-Update-in-Progress-${MIRRORNAME} --exclude=${TRACE} --exclude=Archive-Update-Required-${MIRRORNAME}"
+#RSYNC_OPTIONS="-prltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"
## Options the first pass gets. We do not want the Packages/Source indices
## here, and we also do not want to delete any files yet.