From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 27 Oct 2012 12:05:11 +0000 (+0100)
Subject: Merge branch 'master' into distorted
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mirror-admin/commitdiff_plain/56e8c7af77dd4722851949e602f566c68fe15e88?ds=sidebyside;hp=--cc

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
---

56e8c7af77dd4722851949e602f566c68fe15e88
diff --cc bin/run-mirrors
index d13619a,9c24c7d..8fb9ccc
--- a/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