lots of fixes, improvements, t12 stuff

[distro-setup] / mailtest-check

diff --git a/mailtest-check b/mailtest-check
index 856d774d32a82995fa93f31efdc17a46e9218ab5..fd27ae5ed984c08e7b5b9f3d92d4ac15c6c75797 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -83,6 +83,11 @@ fi
 # TODO, get je to deliver the local mailbox: /m/md/INBOX
 # dovecot appears to setup, i can t be sure.
 
+spamd_ser=spamd
+if systemctl cat spamassassin &>/dev/null; then
+  spamd_ser=spamassassin
+fi
+
 source /a/bin/bash_unpublished/source-state
 
 doprom=false
@@ -158,8 +163,8 @@ EOF
   fi
   e spamdpid: $spamdpid
   if [[ ! $spamdpid ]]; then
-    echo mailtest spamd pid not found. systemctl status spamassassin:
-    systemctl status spamassassin
+    echo mailtest spamd pid not found. systemctl status $spamd_ser:
+    systemctl status $spamd_ser
   fi
   tmpfile=$(mktemp)
   declare -i unexpected=0