iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots of fixes, improvements, t12 stuff
[distro-setup]
/
mailtest-check
diff --git
a/mailtest-check
b/mailtest-check
index 034dfc6b45a7d6c72413fc2a70537fe1ca7d5182..fd27ae5ed984c08e7b5b9f3d92d4ac15c6c75797 100755
(executable)
--- a/
mailtest-check
+++ b/
mailtest-check
@@
-40,7
+40,7
@@
e() { $int || return 0; printf "mailtest-check: %s\n" "$*"; }
getspamdpid() {
if [[ ! $spamdpid || ! -d /proc/$spamdpid ]]; then
# try twice in case we are restarting, it happens.
getspamdpid() {
if [[ ! $spamdpid || ! -d /proc/$spamdpid ]]; then
# try twice in case we are restarting, it happens.
- for
i in 1 2
; do
+ for
(( i=0; i<2; i++ ))
; do
spamdpid=$(systemctl show --property MainPID --value spamassassin | sed 's/^[10]$//' ||:)
if [[ $spamdpid ]]; then
break
spamdpid=$(systemctl show --property MainPID --value spamassassin | sed 's/^[10]$//' ||:)
if [[ $spamdpid ]]; then
break
@@
-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.
# 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
source /a/bin/bash_unpublished/source-state
doprom=false
@@
-158,8
+163,8
@@
EOF
fi
e spamdpid: $spamdpid
if [[ ! $spamdpid ]]; then
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
fi
tmpfile=$(mktemp)
declare -i unexpected=0