Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
b54ddc2a
by Joerg Jaspert at 2018-04-19T22:46:02+02:00
2 changed files:
Changes:
| ... | ... | @@ -33,11 +33,23 @@ declare -r done=$queuedir/done/ # from debian-security |
| 33 | 33 |
TMPDIR=${base}/tmp
|
| 34 | 34 |
PATH=${masterdir}:${PATH}
|
| 35 | 35 |
|
| 36 |
-declare -r HOSTNAME=$(hostname -s)
|
|
| 37 |
- |
|
| 38 | 36 |
# By default, add no timestamps to stage logs
|
| 39 | 37 |
TIMESTAMP=false
|
| 40 | 38 |
|
| 39 |
+declare -r HOSTNAME=$(hostname -s)
|
|
| 40 |
+ |
|
| 41 |
+# where do we want mails to go? For example log entries made with error()
|
|
| 42 |
+case ${HOSTNAME} in
|
|
| 43 |
+ fasolo|seger|coccia)
|
|
| 44 |
+ # Yay, ftpmaster
|
|
| 45 |
+ MAILTO=${MAILTO:-"ftpmaster@debian.org"}
|
|
| 46 |
+ ;;
|
|
| 47 |
+ *)
|
|
| 48 |
+ # Not our ftpmaster host
|
|
| 49 |
+ MAILTO=${MAILTO:-"root"}
|
|
| 50 |
+ ;;
|
|
| 51 |
+esac
|
|
| 52 |
+ |
|
| 41 | 53 |
if [[ ${ARG:-none} != deploy ]]; then
|
| 42 | 54 |
declare -r archs=$(dak admin a list | tr '\n' ' ')
|
| 43 | 55 |
|
| ... | ... | @@ -2,15 +2,6 @@ |
| 2 | 2 |
# usually we are not using debug logs. Set to 1 if you want them.
|
| 3 | 3 |
DEBUG=0
|
| 4 | 4 |
|
| 5 |
-# where do we want mails to go? For example log entries made with error()
|
|
| 6 |
-if [[ ${HOSTNAME} != franck ]] && [[ ${HOSTNAME} != fasolo ]]; then
|
|
| 7 |
- # Not our ftpmaster host
|
|
| 8 |
- MAILTO=${MAILTO:-"root"}
|
|
| 9 |
-else
|
|
| 10 |
- # Yay, ftpmaster
|
|
| 11 |
- MAILTO=${MAILTO:-"ftpmaster@debian.org"}
|
|
| 12 |
-fi
|
|
| 13 |
- |
|
| 14 | 5 |
# How many logfiles to keep
|
| 15 | 6 |
LOGROTATE=${LOGROTATE:-400}
|
| 16 | 7 |
|