diff options
| -rwxr-xr-x | bin/ftpsync | 12 | ||||
| -rw-r--r-- | etc/ftpsync.conf.sample | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bin/ftpsync b/bin/ftpsync index e612c56..0085b05 100755 --- a/bin/ftpsync +++ b/bin/ftpsync @@ -196,7 +196,7 @@ fi ######################################################################## # There should be nothing to edit here, use the config file # ######################################################################## -HOSTNAME=${HOSTNAME:-`hostname -f`} +MIRRORNAME=${MIRRORNAME:-`hostname -f`} # Where to put logfiles in LOGDIR=${LOGDIR:-"${BASEDIR}/log"} # Our own logfile @@ -209,7 +209,7 @@ TO=${TO:-"/org/ftp.debian.org/ftp/"} PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"} # Where to send mails about mirroring to? -if [ "x${HOSTNAME}x" != "x${HOSTNAME%%.debian.org}x" ]; then +if [ "x${MIRRORNAME}x" != "x${MIRRORNAME%%.debian.org}x" ]; then # We are not on a debian.org host MAILTO=${MAILTO:-"root"} else @@ -225,16 +225,16 @@ SAVELOG=${SAVELOG:-"savelog -t -c 14"} LOCKFILE=${LOCKFILE:-"lockfile"} # Our lockfile -LOCK=${LOCK:-"${TO}/Archive-Update-in-Progress-${HOSTNAME}"} +LOCK=${LOCK:-"${TO}/Archive-Update-in-Progress-${MIRRORNAME}"} # Do we need another rsync run? -UPDATEREQUIRED="${TO}/Archive-Update-Required-${HOSTNAME}" +UPDATEREQUIRED="${TO}/Archive-Update-Required-${MIRRORNAME}" # Trace file for mirror stats and checks (make sure we get full hostname) -TRACE=${TRACE:-"project/trace/$(hostname -f)"} +TRACE=${TRACE:-"project/trace/${MIRRORNAME}"} # rsync program RSYNC=${RSYNC:-rsync} # Default rsync options for *every* rsync call -RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-rltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${HOSTNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${HOSTNAME}"} +RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-rltvHSB8192 --timeout 3600 --stats --exclude Archive-Update-in-Progress-${MIRRORNAME} --exclude ${TRACE} --exclude Archive-Update-Required-${MIRRORNAME}"} # 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/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample index c9a188d..4d105c1 100644 --- a/etc/ftpsync.conf.sample +++ b/etc/ftpsync.conf.sample @@ -6,9 +6,9 @@ ######################################################################## ######################################################################## -## Hostname. This is used for things like the trace file and should always +## Mirrorname. This is used for things like the trace file and should always ## be the full hostname of the mirror. -#HOSTNAME=`hostname -f` +#MIRRORNAME=`hostname -f` ## In which directory should logfiles end up ## Note that BASEDIR defaults to $HOME, but can be set before calling the @@ -31,9 +31,9 @@ ## on a .debian.org machine where it will default to the mirroradm people. #MAILTO="root" -## If you do not want a mail about every single sync, set this to something -## false. Everything else will only send mails if a mirror sync fails -#ERRORSONLY="false" +## If you do want a mail about every single sync, set this to false +## Everything else will only send mails if a mirror sync fails +#ERRORSONLY="true" ## We do create three logfiles for every run. To save space we rotate them, this ## defines how. |