make sure cdpath isnt ever set in scripts

[dak.git] / config / backports / vars

diff --git a/config/backports/vars b/config/backports/vars
index e61a11b6ec376937e2226938a327ce0b1106fef3..0fb674276d4e7f308ffa06eff807c894b9241522 100644 (file)
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,16 +1,21 @@
 # locations used by many scripts
 
-base=/org/backports.org
+base=/srv/backports-master.debian.org
+public=/srv/backports-web.debian.org
+bindir=$base/bin
 ftpdir=$base/ftp/
-webdir=$base/web
+indices=$ftpdir/indices
+webdir=$public/underlay/
+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/debian/
+dbdir=$base/database/
 
 queuedir=$base/queue
 unchecked=$queuedir/unchecked/
@@ -18,10 +23,14 @@ 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/
+exportdir=$base/export/
+exportpublic=$public/export/
 
-dbdir=$base/database/
-indices=$ftpdir/indices
 
 ftpgroup=debadmin
 
@@ -37,9 +46,13 @@ suites="lenny-backports"
 override_types="deb dsc udeb"
 
 # temporary fix only!
-# export TMP=/org/backports.org/tmp
-# export TEMP=/org/backports.org/tmp
-# export TMPDIR==/org/backports.org/tmp
+# export TMP=/srv/backports-master.debian.org/tmp
+# export TEMP=/srv/backports-master.debian.org/tmp
+# export TMPDIR==/srv/backports-master.debian.org/tmp
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
+
+# Set the database variables
+eval $(dak admin config db-shell)