diff options
author | Simon Paillard <spaillard@debian.org> | 2011-11-23 23:47:40 +0100 |
---|---|---|
committer | Simon Paillard <spaillard@debian.org> | 2011-11-23 23:47:40 +0100 |
commit | 9b76915f679ebfa5988a5c47f102bc7faf3363ce (patch) | |
tree | fae077c062c315dd4a57dd61b6a3231c8d02a2eb | |
parent | 1a763b0d29bd746131a04e7b1ed1993fd871db40 (diff) |
ftpsync: better default conf
TO and RSYNC_PATH for regular mirroradm setup
-rwxr-xr-x | bin/ftpsync | 4 | ||||
-rw-r--r-- | etc/ftpsync.conf.sample | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ftpsync b/bin/ftpsync index 0cde4b1..d988d0e 100755 --- a/bin/ftpsync +++ b/bin/ftpsync @@ -243,7 +243,7 @@ LOGDIR=${LOGDIR:-"${BASEDIR}/log"} LOG=${LOG:-"${LOGDIR}/${NAME}.log"} # Where should we put all the mirrored files? -TO=${TO:-"/org/ftp.debian.org/ftp/"} +TO=${TO:-"/srv/mirrors/debian/"} # used by log() and error() PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"} @@ -287,7 +287,7 @@ RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--exclude Packages* --exclude Sources* --exclu # Options for the second pass, where we do want everything, including deletion of old and now unused files 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:-"ftp"} +RSYNC_PATH=${RSYNC_PATH:-"debian"} # Now add the bwlimit option. As default is 0 we always add it, rsync interprets # 0 as unlimited, so this is safe. diff --git a/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample index df490f1..db3ac8f 100644 --- a/etc/ftpsync.conf.sample +++ b/etc/ftpsync.conf.sample @@ -13,10 +13,10 @@ ## Destination of the mirrored files. Should be an empty directory. ## CAREFUL, this directory will contain the mirror. Everything else ## that might have happened to be in there WILL BE GONE after the mirror sync! -#TO="/org/ftp.debian.org/ftp/" +#TO="/srv/mirrors/debian/" ## The upstream name of the rsync share. -#RSYNC_PATH="ftp" +#RSYNC_PATH="debian" ## The host we mirror from #RSYNC_HOST=some.mirror.debian.org |