X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fvars;h=83cbcf1bd7c6a924728b6bf3cf723993a8dba592;hb=9639afdb34ea7c5fdaf62e05a78ca0aab288f6de;hp=b88a83d2f10b598a8d3a9f52ba88081bed6a0574;hpb=2764c503d2f9c2177873f861c9dad76bcd2c04ca;p=dak.git

diff --git a/config/debian/vars b/config/debian/vars
index b88a83d2..83cbcf1b 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,10 +1,13 @@
+# -*- mode:sh -*-
 # locations used by many scripts
 
-base=/srv/ftp.debian.org
+base=/srv/ftp-master.debian.org
+public=/srv/ftp.debian.org
+bindir=$base/bin
 ftpdir=$base/ftp
-webdir=$base/web
+webdir=$public/web
 indices=$ftpdir/indices
-archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc"
+archs=$(dak admin a list | tr '\n' ' ')
 
 scriptdir=$base/scripts
 masterdir=$base/dak/
@@ -12,18 +15,35 @@ configdir=$base/dak/config/debian/
 scriptsdir=$base/dak/scripts/debian/
 dbdir=$base/database/
 lockdir=$base/lock/
+stagedir=$lockdir/stages
 overridedir=$scriptdir/override
 extoverridedir=$scriptdir/external-overrides
+logdir=$base/log/cron/
 
 queuedir=$base/queue/
 unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
-incoming=$base/incoming
+mirrordir=$base/mirror/
+incoming=$base/public/incoming.debian.org/
+newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin
 
-copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sarge.contrib sarge.contrib.src sarge.main sarge.main.src sarge.non-free sarge.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free sarge.extra.contrib sarge.extra.main sarge.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free"
+public_archives=(ftp-master backports debian-debug)
+
+TMPDIR=${base}/tmp
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
+GZIP='--rsyncable' ; export GZIP
+
+# lock cron.unchecked (it immediately exits when this exists)
+LOCK_DAILY="$lockdir/daily.lock"
+LOCK_UNCHECKED="$lockdir/unchecked.lock"
+LOCK_STOP="$lockdir/archive.stop"
 
+# Set the database variables
+eval $(dak admin config db-shell)