Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / config / debian / vars

diff --git a/config/debian/vars b/config/debian/vars
index 09a047b2ac566567e559b5442bbe123b695b8f96..0d5eb5299acc040dc3ead0066659eec17086b4c2 100644 (file)
--- 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,9 @@ unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
 incoming=$base/incoming
+newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin
 
@@ -31,3 +35,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 config db-shell)