Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
e0206c37
by Joerg Jaspert at 2018-05-18T19:17:52+02:00
2 changed files:
Changes:
... | ... | @@ -82,4 +82,4 @@ declare -r LOCK_CHANGELOG="$lockdir/changelog.lock" |
82 | 82 |
declare -r LOCK_STOP="${lockdir}/archive.stop"
|
83 | 83 |
|
84 | 84 |
# Lock for deploying new code
|
85 |
-declare -r LOCK_DEPLOY="${lockdir}/deploy"
|
|
85 |
+declare -r LOCK_DEPLOY=${LOCK_DEPLOY:-"${lockdir}/deploy"}
|
... | ... | @@ -12,5 +12,8 @@ base=/srv/${functionname} |
12 | 12 |
masterdir=${base}/dak/
|
13 | 13 |
export configdir=${configdir:-${masterdir}/config/${confpart}/}
|
14 | 14 |
|
15 |
+# Lock for deploying new code - does not use the pre-defined lockdir!
|
|
16 |
+LOCK_DEPLOY="${base}/lock/deploy"
|
|
17 |
+ |
|
15 | 18 |
# And get all the tons of other variables
|
16 | 19 |
source ${configdir}/../${confpart}/vars
|