diff options
| author | Simon Paillard <simon.paillard@resel.enst-bretagne.fr> | 2010-03-13 16:21:32 +0100 |
|---|---|---|
| committer | Simon Paillard <simon.paillard@resel.enst-bretagne.fr> | 2010-03-13 16:21:32 +0100 |
| commit | 85c0d9721c5ef29d90e883cd3f04e2a8f7301bfe (patch) | |
| tree | 5f3b1799318531228f3a503561df8e8d8a31ead3 | |
| parent | ccd86cba4b16862aaaa04a5a47d91576dfceb3cd (diff) | |
Defualt RSYNC_OPTIONS: preserve permissions
| -rwxr-xr-x | bin/ftpsync | 2 | ||||
| -rwxr-xr-x | bin/websync | 2 | ||||
| -rw-r--r-- | etc/ftpsync.conf.sample | 2 | ||||
| -rw-r--r-- | etc/websync.conf.sample | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/ftpsync b/bin/ftpsync index 6e9daeb..580a80f 100755 --- a/bin/ftpsync +++ b/bin/ftpsync @@ -278,7 +278,7 @@ RSYNC=${RSYNC:-rsync} # excluded files RSYNC_FILTER=${RSYNC_FILTER:-"--filter=protect_Archive-Update-in-Progress-${MIRRORNAME} --filter=protect_${TRACE} --filter=protect_Archive-Update-Required-${MIRRORNAME}"} # Default rsync options for *every* rsync call -RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-rltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"} +RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-prltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"} # Options we only use in the first pass, where we do not want packages/sources to fly in yet and dont want to delete files RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--exclude Packages* --exclude Sources* --exclude Release* --exclude ls-lR*"} # Options for the second pass, where we do want everything, including deletion of old and now unused files diff --git a/bin/websync b/bin/websync index b96ba54..f46e3ec 100755 --- a/bin/websync +++ b/bin/websync @@ -154,7 +154,7 @@ RSYNC=${RSYNC:-rsync} # excluded files RSYNC_FILTER=${RSYNC_FILTER:-"--filter=protect_Website-Update-in-Progress-${MIRRORNAME} --filter=protect_${TRACE} --filter=protect_Website-Update-Required-${MIRRORNAME}"} # Default rsync options for *every* rsync call -RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-rltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"} +RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-prltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"} RSYNC_OPTIONS2=${RSYNC_OPTIONS2:-"--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded"} # Which rsync share to use on our upstream mirror? RSYNC_PATH=${RSYNC_PATH:-"web.debian.org"} diff --git a/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample index b96c3d8..e6615e7 100644 --- a/etc/ftpsync.conf.sample +++ b/etc/ftpsync.conf.sample @@ -102,7 +102,7 @@ ## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T! ## Default rsync options every rsync invocation sees. -#RSYNC_OPTIONS="-rltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${MIRRORNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${MIRRORNAME}" +#RSYNC_OPTIONS="-prltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${MIRRORNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${MIRRORNAME}" ## 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. diff --git a/etc/websync.conf.sample b/etc/websync.conf.sample index 7a0aca7..7a39313 100644 --- a/etc/websync.conf.sample +++ b/etc/websync.conf.sample @@ -92,7 +92,7 @@ ## BE VERY CAREFUL WHEN YOU CHANGE THE RSYNC_OPTIONS! BETTER DON'T! ## Default rsync options every rsync invocation sees. -#RSYNC_OPTIONS="-rltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${MIRRORNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${MIRRORNAME}" +#RSYNC_OPTIONS="-prltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${MIRRORNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${MIRRORNAME}" ## Default rsync options #RSYNC_OPTIONS2=${RSYNC_OPTIONS2:-"--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded"} |