Update mail.conf and warn-git-status for different mailx.
This commit is contained in:
parent
e34a2333a7
commit
85d25d6759
2 changed files with 3 additions and 3 deletions
|
|
@ -6,4 +6,4 @@ CONFIGSTATUS="$(cd / && git status | egrep -ve "^(On branch|Your branch|No commi
|
||||||
|
|
||||||
[[ -z "$CONFIGSTATUS" ]] && exit 0
|
[[ -z "$CONFIGSTATUS" ]] && exit 0
|
||||||
|
|
||||||
mailx "${MAILX_ARGS[@]}" -r "$EMAIL_FROM" -s "git statuses" "${EMAIL_TO[@]}" <<<"$CONFIGSTATUS"
|
mailx "${MAILX_ARGS[@]}" -S from="$EMAIL_FROM" -s "git statuses" "${EMAIL_TO[@]}" <<<"$CONFIGSTATUS"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# This file is sourced by various scripts that need to send emails.
|
# This file is sourced by various scripts that need to send emails.
|
||||||
|
|
||||||
case "$(hostname -d)" in
|
case "${HOSTNAME#*.}" in
|
||||||
afterdark.lan)
|
afterdark.lan)
|
||||||
EMAIL_DOMAIN="afterdark.org.uk"
|
EMAIL_DOMAIN="afterdark.org.uk"
|
||||||
;;
|
;;
|
||||||
|
|
@ -10,7 +10,7 @@ case "$(hostname -d)" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
EMAIL_FROM="${HOSTNAME%%.*} <noreply@$EMAIL_DOMAIN>"
|
EMAIL_FROM="${HOSTNAME%%.*} <noreply@$EMAIL_DOMAIN>"
|
||||||
EMAIL_TO=("Systems Administrator <sysadmin@$EMAIL_DOMAIN>")
|
EMAIL_TO=("sysadmin@$EMAIL_DOMAIN")
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
sbosrcarch)
|
sbosrcarch)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue