X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fvars;h=22ad8aeae1c7cf4f911a1696c4f65fd33d23aa8a;hb=95439774809701032eaac48a9d216989ac882a32;hp=35e9f0e5eb2dbe90972079da2c4ac155307e88a0;hpb=87bf163d12ec8328d87e1b2a2ca2239221a73bd6;p=dak.git

diff --git a/config/debian/vars b/config/debian/vars
index 35e9f0e5..22ad8aea 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 "
 
@@ -24,6 +25,8 @@ accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
 incoming=$base/incoming
 newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin
 
@@ -31,4 +34,7 @@ copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-fr
 
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
 
+# Set the database variables
+eval $(dak admin config db-shell)