harden exim

[distro-setup] / mailtest-check

diff --git a/mailtest-check b/mailtest-check
index cd12bc7b3738ff47d775d27ec9f444974d6d2359..3fdefffb1050afca706edf6622ee5e061dc33185 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -69,20 +69,21 @@ case $HOSTNAME in
     folders=(/m/md/l/testignore)
     froms=(testignore@je.b8.nz testignore@expertpathologyreview.com testignore@amnimal.ninja ian@iankelling.org z@zroe.org iank@gnu.org)
     if ! $int; then
-      timeout 120 rsync -e "ssh -oIdentitiesOnly=yes -F /dev/null -i /root/.ssh/jtuttle" -t --inplace -r 'jtuttle@fencepost.gnu.org:/home/j/jtuttle/Maildir/new/' /m/md/l/testignore/new
+      timeout 120 rsync --chown iank:iank -e "ssh -oIdentitiesOnly=yes -F /dev/null -i /root/.ssh/jtuttle" -t --inplace -r 'jtuttle@fencepost.gnu.org:/home/j/jtuttle/Maildir/new/' /m/md/l/testignore/new
     fi
     ;;
 esac
 
 getspamdpid() {
   if [[ ! $spamdpid || ! -d /proc/$spamdpid ]]; then
-    spamdpid=$(systemctl status spamassassin| sed -n '/^ *Main PID:/s/[^0-9]//gp')
+    spamdpid=$(systemctl status spamassassin| sed -n '/^ *Main PID:/s/[^0-9]//gp' ||:)
   fi
 }
 getspamdpid
 e spamdpid: $spamdpid
 if [[ ! $spamdpid ]]; then
-  echo $HOSTNAME mailtest spamd pid not found
+  echo $HOSTNAME mailtest spamd pid not found. systemctl status spamassassin:
+  systemctl status spamassassin
 fi
 tmpfile=$(mktemp)
 for folder in ${folders[@]}; do