Change how we generate incoming.debian.org

[dak.git] / config / debian / vars

diff --git a/config/debian/vars b/config/debian/vars
index 69cef765d4feed201292fb54de9c8f0b269dea97..e14e5158c5bae1d27feb86f8e4767568d9509492 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,10 +1,12 @@
 # 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,6 +14,7 @@ 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/
@@ -20,12 +23,21 @@ 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"
+public_archives=(ftp-master backports)
+
+TMPDIR=${base}/tmp
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
+GZIP='--rsyncable' ; export GZIP
 
+# Set the database variables
+eval $(dak admin config db-shell)