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

diff --git a/config/debian/vars b/config/debian/vars
index 35e9f0e5..83cbcf1b 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,11 +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 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
+archs=$(dak admin a list | tr '\n' ' ')
 
 scriptdir=$base/scripts
 masterdir=$base/dak/
@@ -22,13 +24,26 @@ queuedir=$base/queue/
 unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
-incoming=$base/incoming
+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 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 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 squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.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)