summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2015-05-25 01:00:46 -0600
committerLuke Shumaker <lukeshu@parabola.nu>2018-03-14 16:58:22 -0400
commit55265704d13cd507cb4328bb36619c39b08c1dd1 (patch)
tree1c7526a5bfc3729c7314e0aa58ca1b19ce7fce30
parent0ea133b67d043e145c1b6452e54e07d9970f65ba (diff)
devlist-mailer: Make LIST and FROM configurablelukeshu/to-upstream/2018-03-14-archlinux+cleanup-v3
-rw-r--r--config5
-rwxr-xr-xcron-jobs/devlist-mailer5
2 files changed, 7 insertions, 3 deletions
diff --git a/config b/config
index d703e7b..fd79b6e 100644
--- a/config
+++ b/config
@@ -35,6 +35,11 @@ PKGEXTS=".pkg.tar.@(gz|bz2|xz|lzo|lrz|Z)"
# Allowed licenses: get sourceballs only for licenses in this array
ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'GPL3' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1' 'LGPL3')
+# Where to send error emails, and who they are from
+LIST="arch-dev-public@archlinux.org"
+#LIST="aaronmgriffin@gmail.com"
+FROM="repomaint@archlinux.org"
+
# Override default config with config.local
LOCAL_CONFIG=${DBSCRIPTS_CONFIG:-"$(dirname "${BASH_SOURCE[0]}")/config.local"}
[[ -f "${LOCAL_CONFIG}" ]] && . "${LOCAL_CONFIG}"
diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer
index 1b59cb3..578d23e 100755
--- a/cron-jobs/devlist-mailer
+++ b/cron-jobs/devlist-mailer
@@ -2,9 +2,8 @@
#Dummy helper to send email to arch-dev
# It does nothing if no output
-LIST="arch-dev-public@archlinux.org"
-#LIST="aaronmgriffin@gmail.com"
-FROM="repomaint@archlinux.org"
+# Load $LIST and $FROM from the config file
+. "$(dirname "$(readlink -e "$0")")/../config"
SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")"
if (( $# >= 1 )); then