mostly fixes

[distro-setup] / mailtest-check

diff --git a/mailtest-check b/mailtest-check
index e28d5ae966750233f5778c20c26a7c1d58be54a6..91e577cbe23d4abf5c92ba1993c95d77d5eebbec 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -29,7 +29,7 @@ getspamdpid() {
   fi
 }
 pr() {
-  if [[ -e /var/lib/prometheus/node-exporter ]]; then
+  if $doprom && [[ -e /var/lib/prometheus/node-exporter ]]; then
     cat >>/var/lib/prometheus/node-exporter/mailtest-check.prom.$$
   fi
 }
@@ -66,7 +66,17 @@ fi
 # TODO, get je to deliver the local mailbox: /m/md/INBOX
 # dovecot appears to setup, i can t be sure.
 
+source /a/bin/bash_unpublished/source-state
 
+doprom=false
+case $HOSTNAME in
+  $MAIL_HOST|bk|je)
+    doprom=true
+    ;;
+  *)
+    rm -f /var/lib/prometheus/node-exporter/mailtest-check.prom*
+    ;;
+esac
 
 main() {
 
@@ -76,7 +86,7 @@ main() {
       froms=(ian@iankelling.org z@zroe.org testignore@je.b8.nz iank@gnu.org)
       ;;
     je)
-      froms=(ian@iankelling.org z@zroe.org testignore@expertpathologyreview.com testignore@amnimal.ninja)
+      froms=(ian@iankelling.org z@zroe.org iank@gnu.org testignore@amnimal.ninja)
       folders=(/m/md/je.b8.nz/testignore)
       ;;
     *)