summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-04-18 12:10:18 +0200
committerErich Eckner <git@eckner.net>2018-04-18 12:10:18 +0200
commitae25c307af96c3078ed96d0f36de8d8e12e4db80 (patch)
treebe4840e1bbfe5fb253677789a825bc7a1420a593
parent85a12934a53fc06f5d4902e4e23ca79efc3f3995 (diff)
downloadbuilder-ae25c307af96c3078ed96d0f36de8d8e12e4db80.tar.xz
remove conf/admin-gpg-keys and all traces
-rwxr-xr-xbin/interpret-mail8
-rwxr-xr-xconf/default.conf13
2 files changed, 3 insertions, 18 deletions
diff --git a/bin/interpret-mail b/bin/interpret-mail
index 30e23fe..85e81b7 100755
--- a/bin/interpret-mail
+++ b/bin/interpret-mail
@@ -5,6 +5,7 @@
# TODO: enable email interface to delete packages
+# shellcheck disable=SC2016
if [ $# -ne 0 ]; then
>&2 echo ''
>&2 echo 'usage: interpret-mail'
@@ -12,8 +13,8 @@ if [ $# -ne 0 ]; then
>&2 echo ''
>&2 echo ' The email needs a valid hashcash-stamp (>=20 bits)'
>&2 echo ' and valid encryption to buildmaster@archlinux32.org,'
- >&2 echo ' as well as a valid gpg-signature from anyone on the'
- >&2 echo ' list in "conf/admin-gpg-keys". This entry also'
+ >&2 echo ' as well as a valid gpg-signature from anyone in the'
+ >&2 echo ' list in `gpg_keys`. `allowed_email_actions`'
>&2 echo ' determines what instructions are allowed.'
>&2 echo ''
>&2 echo ' Possible instructions are:'
@@ -33,9 +34,6 @@ if [ $# -ne 0 ]; then
>&2 echo ' - "unblock: <state-file>":'
>&2 echo ' Unblock the given packge.'
>&2 echo ''
- >&2 echo ' - ALL: all of the above (only valid in'
- >&2 echo ' "conf/admin-gpg-keys")'
- >&2 echo ''
exit 1
fi
diff --git a/conf/default.conf b/conf/default.conf
index efbb5b4..daaf31c 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -34,19 +34,6 @@ master_build_server_identity="${work_dir}/.ssh/id_rsa"
repo_key='0xdeadbeef'
package_key='0x15eebadc0de'
-# what can be done via the email interface
-possible_email_actions='stabilize block unblock schedule copy-to-build-support'
-
-# how many lines of email logs should be kept maximally
-max_mail_log_lines=10
-
-# who can do above actions
-if [ -s "${base_dir}/conf/admin-gpg-keys" ]; then
- admin_gpg_keys=$(
- sed 's|\s*#.*$||' "${base_dir}/conf/admin-gpg-keys"
- )
-fi
-
# How long should packages in the pipeline be considered "fresh" (in days)?
# If a package surpasses this limit, it will be considered unimportant and won't
# block other packages anymore