Remove hardcoding of database name, port etc

[dak.git] / config / debian / vars

diff --git a/config/debian/vars b/config/debian/vars
index d6e4cbe1d751b4e3e8b424cb8bbf727f5df13992..e8e70c7391e79645c24dfe4c01d8ccd4e06a8966 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,9 +1,10 @@
 # locations used by many scripts
 
 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 "
 
@@ -32,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)