config/variables → config/common/variables

@@ -4,9 +4,6 @@ umask 022
 unset CDPATH
 GZIP='--rsyncable --no-name' ; export GZIP
 
-declare -r masterdir=${base}/dak/
-
-export configdir=${configdir:-${masterdir}/config/${confpart}/}
 export lockdir=${lockdir:-${base}/lock/}
 export logdir=${logdir:-${base}/log/cron/}
 

config/debian-security/vars

@@ -8,12 +8,14 @@ declare -r public_archives=(security debian-security-debug)
 
 declare -r base=/srv/${functionname}
 declare -r incoming=${base}/buildd
+declare -r masterdir=${base}/dak/
+export configdir=${configdir:-${masterdir}/config/${confpart}/}
 
 # And the following types of cronscripts exists
 declare -r POSSIBLEARGS='+(unchecked-dinstall|hourly|mirror)'
 
 # And get all the tons of other variables
-source ../variables
+source ${masterdir}/config/common/variables
 
 # Stuff for old cron scripts not yet switched to new style
 declare -r uploadhost=ftp-master.debian.org

config/debian/vars

@@ -8,9 +8,11 @@ declare -r public_archives=(ftp-master debian-debug)
 
 declare -r base=/srv/${functionname}
 declare -r incoming=${base}/public/incoming.debian.org/
+declare -r masterdir=${base}/dak/
+export configdir=${configdir:-${masterdir}/config/${confpart}/}
 
 # And the following types of cronscripts exists
 declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror|deploy)'
 
 # And get all the tons of other variables
-source ../variables
+source ${masterdir}/config/common/variables