From: Ian Kelling <ian@iankelling.org>
Date: Tue, 20 Oct 2020 22:59:56 +0000 (-0400)
Subject: mail, remove excess commands
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=646e3d4c74ffdf7f28d6cb4b2f0d138e661ed364;p=distro-setup

mail, remove excess commands
---

diff --git a/mail-setup b/mail-setup
index d1fd81b..5e07232 100755
--- a/mail-setup
+++ b/mail-setup
@@ -479,24 +479,21 @@ esac
 # 2020-10-19 remove old file. remove this when all hosts updated
 rm -fv /etc/systemd/system/spamddnsfix.{timer,service}
 
+# per readme.debian, allow nightly cronjob to run
+sed -i '/^\s*CRON\s*=/d' /etc/default/spamassassin
+e CRON=1 >>/etc/default/spamassassin
+
 case $HOSTNAME in
-  $MAIL_HOST)
-    # per readme.debian
-    sed -i '/^\s*CRON\s*=/d' /etc/default/spamassassin
-    e CRON=1 >>/etc/default/spamassassin
+  $MAIL_HOST|bk)
     # just noticed this in the config file, seems like a good idea.
     sed -i '/^\s*NICE\s*=/d' /etc/default/spamassassin
     e 'NICE="--nicelevel 15"' >>/etc/default/spamassassin
 
+    # We wait until later to stop if we arent mailhost, so that if we
+    # are transitioning from mail host to non-mail host, we wont screw
+    # up exim.
     m systemctl enable spamassassin
     m systemctl start spamassassin
-    m systemctl reload spamassassin
-    ;;
-esac
-
-case $HOSTNAME in
-  $MAIL_HOST|bk)
-    m systemctl restart spamassassin
     ;;
 esac