X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fvars;h=736d8a6fb6470b9f65b45853680ab5c51e8032b5;hb=7a60a3e05199b358f02dc2615cc66ae35f818242;hp=53e557ee7685381f237bc50ba4c8ecd58d9cb1f7;hpb=e15117cd260692b56d3b44f1415fe13f8f1482c1;p=dak.git

diff --git a/config/backports/vars b/config/backports/vars
index 53e557ee..736d8a6f 100644
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,16 +1,21 @@
 # locations used by many scripts
 
 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
 
@@ -36,10 +45,14 @@ components="main contrib non-free"
 suites="lenny-backports"
 override_types="deb dsc udeb"
 
-# temporary fix only!
 # export TMP=/srv/backports-master.debian.org/tmp
 # export TEMP=/srv/backports-master.debian.org/tmp
-# export TMPDIR==/srv/backports-master.debian.org/tmp
+
+TMPDIR==$base/tmp
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
+
+# Set the database variables
+eval $(dak admin config db-shell)