Merge branch 'master' into distorted

* master:
  Keep track of the mirror target directory in an environment variable.

Conflicts:
	bin/run-mirrors
	etc/ftpsync-common.conf

diff --combined bin/run-mirrors
index d13619a,9c24c7d..8fb9ccc
--- 1/bin/run-mirrors
--- 2/bin/run-mirrors
+++ b/bin/run-mirrors
@@@ -9,7 -9,8 +9,8 @@@ case $(id -un) i
  esac
  
  ## Set up a plausible environment.
 -HOME=/var/lib/mirror-admin; export HOME; cd
 -MIRRORS=/mnt/mirrors; export MIRRORS
 +HOME=/var/lib/mirror; export HOME; cd
++MIRRORS=/mnt/ftp/pub/mirrors; export MIRRORS
  PATH=$HOME/bin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin:/usr/local/sbin
  export PATH
  umask 002

diff --combined etc/ftpsync-common.conf
index 74f0e9e,5af48ee..19cff88
--- 1/etc/ftpsync-common.conf
--- 2/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@@ -15,13 -15,13 +15,13 @@@
  ## CAREFUL, this directory will contain the mirror. Everything else that
  ## might have happened to be in there WILL BE GONE after the mirror sync!
  : ${LABEL="debian"}
- : ${TO="/mnt/ftp/pub/mirrors/$LABEL/"}
+ : ${TO="$MIRRORS/$LABEL/"}
  
  ## The upstream name of the rsync share.
  : ${RSYNC_PATH="$LABEL"}
  
  ## The host we mirror from
 -: ${RSYNC_HOST=ftp.de.debian.org}
 +: ${RSYNC_HOST=ftp.uk.debian.org}
  
  ## In case we need a user to access the rsync share at our upstream host
  : ${RSYNC_USER=}
@@@ -30,7 -30,7 +30,7 @@@
  : ${RSYNC_PASSWORD=}
  
  ## Architectures we want to carry.
 -: ${WANT_ARCH="i386:amd64"}
 +: ${WANT_ARCH="i386:amd64:armel"}
  
  ## Distributions to inspect for available architectures.
  : ${SEARCH_DISTS="oldstable stable testing unstable experimental"}
@@@ -83,6 -83,7 +83,6 @@@
  ## want.  Crazy, no?
  ARCH_EXCLUDE=$(
        bin/debian-excludes $RSYNC_HOST $RSYNC_PATH $WANT_ARCH $SEARCH_DISTS
 -      echo source
  )
  
  ## Do we have leaf mirror to signal we are done and they should sync?