X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=vars;h=a4e3b5d0187c81604e6595577e6aa097d3f1fed9;hb=de3991e803cc6f69d5eee0fbf75daf95b0f9969d;hp=d3eb2fd2fdf9374a9436c7fc58b09fec39be1be9;hpb=52e6d9552f88ed0cb6a362bff2b405f017e4759e;p=dak.git

diff --git a/vars b/vars
index d3eb2fd2..a4e3b5d0 100644
--- a/vars
+++ b/vars
@@ -1,20 +1,26 @@
 # locations used by many scripts
 
-ftpdir=/org/ftp.debian.org/ftp
-webdir=/org/ftp.debian.org/web
+base=/org/ftp.debian.org
+ftpdir=$base/ftp
+webdir=$base/web
 indices=$ftpdir/indices
-archs="alpha arm hppa hurd-i386 i386 ia64 m68k powerpc sparc mips mipsel sh"
+archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc"
 
-scriptdir=/org/ftp.debian.org/scripts
-masterdir=/org/ftp.debian.org/katie/
-dbdir=/org/ftp.debian.org/database/
+scriptdir=$base/scripts
+masterdir=$base/katie/
+dbdir=$base/database/
+lockdir=$base/lock/
 overridedir=$scriptdir/override
+extoverridedir=$scriptdir/external-overrides
 
-incoming=/org/ftp.debian.org/incoming
+queuedir=$base/queue/
+unchecked=$queuedir/unchecked/
+accepted=$queuedir/accepted/
+incoming=$base/incoming
 
 ftpgroup=debadmin
 
-copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free woody.extra.contrib woody.extra.main woody.extra.non-free"
+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 woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src 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 woody.extra.contrib woody.extra.main woody.extra.non-free sarge.extra.contrib sarge.extra.main sarge.extra.non-free"
 
 PATH=$masterdir:$PATH
 umask 022