Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
c5f6190f
by Joerg Jaspert at 2018-04-08T12:03:26+02:00
3 changed files:
Changes:
... | ... | @@ -4,9 +4,6 @@ umask 022 |
4 | 4 |
unset CDPATH
|
5 | 5 |
GZIP='--rsyncable --no-name' ; export GZIP
|
6 | 6 |
|
7 |
-declare -r masterdir=${base}/dak/
|
|
8 |
- |
|
9 |
-export configdir=${configdir:-${masterdir}/config/${confpart}/}
|
|
10 | 7 |
export lockdir=${lockdir:-${base}/lock/}
|
11 | 8 |
export logdir=${logdir:-${base}/log/cron/}
|
12 | 9 |
|
... | ... | @@ -8,12 +8,14 @@ declare -r public_archives=(security debian-security-debug) |
8 | 8 |
|
9 | 9 |
declare -r base=/srv/${functionname}
|
10 | 10 |
declare -r incoming=${base}/buildd
|
11 |
+declare -r masterdir=${base}/dak/
|
|
12 |
+export configdir=${configdir:-${masterdir}/config/${confpart}/}
|
|
11 | 13 |
|
12 | 14 |
# And the following types of cronscripts exists
|
13 | 15 |
declare -r POSSIBLEARGS='+(unchecked-dinstall|hourly|mirror)'
|
14 | 16 |
|
15 | 17 |
# And get all the tons of other variables
|
16 |
-source ../variables
|
|
18 |
+source ${masterdir}/config/common/variables
|
|
17 | 19 |
|
18 | 20 |
# Stuff for old cron scripts not yet switched to new style
|
19 | 21 |
declare -r uploadhost=ftp-master.debian.org
|
... | ... | @@ -8,9 +8,11 @@ declare -r public_archives=(ftp-master debian-debug) |
8 | 8 |
|
9 | 9 |
declare -r base=/srv/${functionname}
|
10 | 10 |
declare -r incoming=${base}/public/incoming.debian.org/
|
11 |
+declare -r masterdir=${base}/dak/
|
|
12 |
+export configdir=${configdir:-${masterdir}/config/${confpart}/}
|
|
11 | 13 |
|
12 | 14 |
# And the following types of cronscripts exists
|
13 | 15 |
declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror|deploy)'
|
14 | 16 |
|
15 | 17 |
# And get all the tons of other variables
|
16 |
-source ../variables
|
|
18 |
+source ${masterdir}/config/common/variables
|