Spamassassin should not attempt to start before rules are updated and be...

Spamassassin should not attempt to start before rules are updated and be restarted straight after rules update

Makefile

@@ -17,6 +17,7 @@ define SPAMASSASSIN_SERVICE
 Description=Spamassassin daemon
 After=syslog.target network.target
 Wants=sa-update.timer
+ConditionDirectoryNotEmpty=/etc/mail/spamassassin/sa-update-keys
 
 [Service]
 ExecStart=/usr/bin/spamd
@@ -74,7 +75,7 @@ Description=Spamassassin Rules Update timer
 Documentation=man:sa-update(1)
 
 [Timer]
-OnBootSec=5 min
+OnBootSec=3 min
 OnUnitActiveSec=1 day
 
 [Install]

sa-update.cron

@@ -11,7 +11,7 @@ now=`date +"%d-%b-%Y %T"`
 
 if [ $status -eq 0 ]; then
 	echo "$now: SpamAssassin: Update processed successfully" 
-	systemctl condrestart spamassassin.service >& /dev/null
+	systemctl --quiet is-enabled spamassassin.service; [ $? -eq 0 ] && systemctl restart spamassassin.service >& /dev/null
 	systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && systemctl reload mimedefang.service >& /dev/null
         exit $status
 fi