make sure cdpath isnt ever set in scripts

[dak.git] / config / backports / vars

diff --git a/config/backports/vars b/config/backports/vars
index 6aa89a7b3e2a1b19cc7557b3679209589163e428..0fb674276d4e7f308ffa06eff807c894b9241522 100644 (file)
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,10 +1,11 @@
 # locations used by many scripts
 
 base=/srv/backports-master.debian.org
+public=/srv/backports-web.debian.org
 bindir=$base/bin
 ftpdir=$base/ftp/
 indices=$ftpdir/indices
-webdir=$base/web
+webdir=$public/underlay/
 scriptdir=$base/scripts
 
 archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
@@ -13,7 +14,7 @@ masterdir=$base/dak/
 overridedir=$base/scripts/override
 extoverridedir=$scriptdir/external-overrides
 configdir=$base/dak/config/backports/
-scriptsdir=$base/dak/scripts/backports/
+scriptsdir=$base/dak/scripts/debian/
 dbdir=$base/database/
 
 queuedir=$base/queue
@@ -27,6 +28,8 @@ incoming=$base/incoming
 logdir=$base/log/cron/
 mirrordir=$base/mirror/
 newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/export/
 
 
 ftpgroup=debadmin
@@ -49,6 +52,7 @@ override_types="deb dsc udeb"
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
 
 # Set the database variables
 eval $(dak admin config db-shell)