Attachment 940419 Details for Bug 1145652 – spamassassin-3.3.2-sa-update_systemd.patch

[patch] spamassassin-3.3.2-sa-update_systemd.patch

spamassassin-3.3.2-sa-update_systemd.patch (text/plain), 1.36 KB, created by Robert Scheck on 2014-09-23 12:34:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2014-09-23 12:34:38 UTC

Size: 1.36 KB

patch

obsolete

>--- sa-update.cron	2014-06-10 07:31:25.000000000 +0200
>+++ sa-update.cron	2014-09-23 14:28:25.430573373 +0200
>@@ -13,8 +13,8 @@
>     /usr/bin/pgrep $daemon >& /dev/null
>     [ $? -eq 0 ] && SAUPDATE=yes
> done
>-[ -f /var/run/mimedefang.pid ] && SAUPDATE=yes
>-[ -f /var/run/spampd/spampd.pid ] && SAUPDATE=yes
>+systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && SAUPDATE=yes
>+systemctl --quiet is-active spampd.service; [ $? -eq 0 ] && SAUPDATE=yes
> 
> # Skip sa-update if daemon not detected
> [ -z "$SAUPDATE" ] && exit 0
>@@ -69,10 +69,10 @@
> 	else
>             echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log
> 	fi
>-	 /sbin/service spamassassin condrestart >& /dev/null
>-	 [ -f /etc/init.d/amavisd ] && /sbin/service amavisd condrestart >& /dev/null
>-	 [ -f /var/run/mimedefang.pid ] && /sbin/service mimedefang reload >& /dev/null
>-	 [ -f /etc/init.d/spampd ] && /etc/init.d/spampd condrestart >& /dev/null
>+	 systemctl condrestart spamassassin.service >& /dev/null
>+	 [ -f /usr/lib/systemd/system/amavisd.service ] && systemctl condrestart amavisd.service >& /dev/null
>+	 systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && systemctl reload mimedefang.service >& /dev/null
>+	 [ -f /usr/lib/systemd/system/spampd.service ] && systemctl condrestart spampd.service >& /dev/null
>         exit $status
> fi
> if [ $status -eq 1 ]; then

Actions: View | Diff

Attachments on bug 1145652: 940419