X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fvars;h=e8e70c7391e79645c24dfe4c01d8ccd4e06a8966;hb=07811af814a433ff071d9adb85440c376f7885c3;hp=09a047b2ac566567e559b5442bbe123b695b8f96;hpb=1e1457bde3318c6605b4c97d4299803fdaf8e774;p=dak.git

diff --git a/config/debian/vars b/config/debian/vars
index 09a047b2..e8e70c73 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,9 +1,10 @@
 # locations used by many scripts
 
-base=/srv/ftp.debian.org
+base=/srv/ftp-master.debian.org
+public=/srv/ftp.debian.org
 bindir=$base/bin
 ftpdir=$base/ftp
-webdir=$base/web
+webdir=$public/web
 indices=$ftpdir/indices
 archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
 
@@ -23,6 +24,7 @@ unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
 incoming=$base/incoming
+newstage=$queuedir/newstage/
 
 ftpgroup=debadmin
 
@@ -31,3 +33,5 @@ copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-fr
 PATH=$masterdir:$PATH
 umask 022
 
+# Set the database variables
+eval $(dak/admin.py config db-shell)