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 --git a/bin/run-mirrors b/bin/run-mirrors
index d13619aed97cfb5b1f8ef17a0e1c7b4b287d4b93..8fb9ccc29dbc9f8fb918b4b796adf577497b5a52 100755 (executable)
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@ -10,6 +10,7 @@ esac
 
 ## Set up a plausible environment.
 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 --git a/etc/ftpsync-common.conf b/etc/ftpsync-common.conf
index 74f0e9e0ce68dad21215b348c8fa20285a6dab4c..19cff88a7f108eddd282594f4482abac383623d6 100644 (file)
--- a/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@ -15,7 +15,7 @@
 ## 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"}