update variables

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian-security/vars b/config/debian-security/vars
index 848d1cbdfab1749f15d6e7f28bfe81e9c262d860..b85b6d83d118dc87dd4de0dd29cfdc41f85ae629 100644 (file)
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -1,22 +1,52 @@
 # locations used by many scripts
 
-base=/org/security-master.debian.org
+base=/srv/security-master.debian.org
+public=/srv/security.debian.org
+bindir=$base/bin
 ftpdir=$base/ftp/
-masterdir=$base/dak/config/debian-security/
+masterdir=$base/dak/
+configdir=$masterdir/config/debian-security/
+webdir=$masterdir/web
+indices=$ftpdir/indices
+archs=$(dak admin a list)
+
+scriptdir=$base/scripts
+scriptsdir=$masterdir/scripts/debian/
+dbdir=$base/dak-database/
+lockdir=$base/lock
+stagedir=$lockdir/stages
 overridedir=$base/override
+extoverridedir=$scriptdir/external-overrides
+logdir=$base/log/cron/
+
 queuedir=$base/queue/
 unchecked=$queuedir/unchecked/
 disembargo=$queuedir/unchecked-disembargo/
 accepted=$queuedir/accepted/
 done=$queuedir/done/
 
+mirrordir=$base/mirror/
+newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/rsync/export/
+
 uploadhost=ftp-master.debian.org
 uploaddir=/pub/UploadQueue/
 
+ftpgroup=debadmin
+
 components="main non-free contrib"
-suites="oldstable stable testing"
+suites="stable testing"
 override_types="deb dsc udeb"
 
+TMPDIR=${base}/tmp
+
 PATH=$masterdir:$PATH
 umask 022
+unset CDPATH
+
+# Set the database variables
+eval $(dak admin config db-shell)
 
+PATH=$masterdir:$PATH
+umask 022