[dak/master] Update vars

[Joerg Jaspert <joerg@debian.org>]

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/backports/vars |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/backports/vars b/config/backports/vars
index 53e557e..6aa89a7 100644
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,16 +1,20 @@
 # locations used by many scripts
 
 base=/srv/backports-master.debian.org
+bindir=$base/bin
 ftpdir=$base/ftp/
+indices=$ftpdir/indices
 webdir=$base/web
+scriptdir=$base/scripts
 
-archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc"
+archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
 
 masterdir=$base/dak/
 overridedir=$base/scripts/override
 extoverridedir=$scriptdir/external-overrides
-configdir=$base/dak/config/backports.org/
-scriptsdir=$base/dak/scripts/backports.org/
+configdir=$base/dak/config/backports/
+scriptsdir=$base/dak/scripts/backports/
+dbdir=$base/database/
 
 queuedir=$base/queue
 unchecked=$queuedir/unchecked/
@@ -18,10 +22,12 @@ accepted=$queuedir/accepted/
 done=$queuedir/done/
 over=$base/over/
 lockdir=$base/lock/
+stagedir=$lockdir/stages
 incoming=$base/incoming
+logdir=$base/log/cron/
+mirrordir=$base/mirror/
+newstage=$queuedir/newstage/
 
-dbdir=$base/database/
-indices=$ftpdir/indices
 
 ftpgroup=debadmin
 
@@ -43,3 +49,6 @@ override_types="deb dsc udeb"
 
 PATH=$masterdir:$PATH
 umask 022
+
+# Set the database variables
+eval $(dak admin config db-shell)
-- 
1.5.6.5