From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Fri, 21 Oct 2016 18:14:06 +0000 (+0200)
Subject: izmjene za systemd
X-Git-Tag: debian/2%3.4.0-2^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=spamassassin-cn.git;a=commitdiff_plain;h=17963bc962935b6b4f9ecce21a36dfe2506a7afc

izmjene za systemd
---

diff --git a/debian/changelog b/debian/changelog
index 428ed37..1b49f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spamassassin-cn (2:3.4.0-2) stable; urgency=low
+
+  * Ispravke za systemd
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Fri, 21 Oct 2016 20:13:51 +0200
+
 spamassassin-cn (2:3.4.0-1) stable; urgency=low
 
   * prva verzija za jessie
diff --git a/debian/postinst b/debian/postinst
index faf9cf4..83bd72f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -59,12 +59,8 @@ db_stop || true
 if [ "$run_as_user" = "non-root" ]; then
     if ! grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d --quiet spamassassin stop
-        else
-            /etc/init.d/spamassassin stop
-        fi
-    rstart=yes
+        systemctl stop spamassassin
+        rstart=yes
     fi
 
     if ! getent group spamd >/dev/null 2>&1; then
@@ -91,12 +87,8 @@ if [ "$run_as_user" = "non-root" ]; then
 elif [ "$run_as_user" = "root" ]; then
     if grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d --quiet spamassassin stop
-        else
-            /etc/init.d/spamassassin stop
-        fi
-    restart=yes
+        systemctl stop spamassassin
+        restart=yes
     fi
 
     if [ -d "/var/run/spamd" ]; then
@@ -407,27 +399,13 @@ echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
 
 # restart the spamasassin
 if [ "x$restart" = "xyes" ]; then
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-        pkill -f /usr/sbin/spamd || true
-        invoke-rc.d spamassassin restart
-    else
-        /etc/init.d/spamassassin restart
-    fi
+    pkill -f /usr/sbin/spamd || true
+    systemctl restart spamassassin
 fi
 
 # restart the amavis
-if [ "x$restart" = "xyes" -a -x /etc/init.d/amavisd-cn ]; then
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-        invoke-rc.d --quiet amavisd-cn restart 
-    else
-        /etc/init.d/amavisd-cn restart
-    fi
-elif [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-        invoke-rc.d --quiet amavis restart 
-    else
-        /etc/init.d/amavis restart
-    fi
+if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
+    systemctl restart amavis
 fi
 
 # dh_installdeb will replace this with shell code automatically