Fix rc scripts

diff --git a/centos/sources/rspamd.init b/centos/sources/rspamd.init
index ffc7020b6ba6be3a4ecefde83c07261cbb9331bb..ee3365b3121ad0c207316f2150b1c1e3ffca9073 100644 (file)
--- a/centos/sources/rspamd.init
+++ b/centos/sources/rspamd.init
@@ -28,6 +28,7 @@
 [ "$NETWORKING" = "no" ] && exit 0
 
 rspamd="/usr/bin/rspamd"
+rspamadm="/usr/bin/rspamadm"
 prog=$(basename $rspamd)
 
 RSPAMD_CONF_FILE="/etc/rspamd/rspamd.sysvinit.conf"
@@ -87,7 +88,7 @@ force_reload() {
 }
 
 configtest() {
-  $rspamd -u $RSPAMD_USER -g $RSPAMD_GROUP -t -c $RSPAMD_CONF_FILE
+  $rspamadm configtest -c $RSPAMD_CONF_FILE
 }
 
 rh_status() {

diff --git a/debian/rspamd.init b/debian/rspamd.init
index 07eba1bd64b99fee1ab7fe58071c461e774a3950..6465a8d39e1e27514cde39fa6870351b7e0f1da9 100644 (file)
--- a/debian/rspamd.init
+++ b/debian/rspamd.init
@@ -16,6 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Rspamd"
 NAME=rspamd
 DAEMON=/usr/bin/$NAME
+RSPAMADM=/usr/bin/rspamdadm
 DAEMON_ARGS="-c /etc/rspamd/rspamd.sysvinit.conf"
 DESC="rapid spam filtering system"
 PIDFILE=/run/rspamd/$NAME.pid
@@ -42,7 +43,7 @@ do_start()
        #   2 if daemon could not be started
        mkdir -m 755 -p /run/rspamd
        chown _rspamd:_rspamd /run/rspamd
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+       $RSPAMADM configtest $DAEMON_ARGS > /dev/null \
                || return 1
        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
                $DAEMON_ARGS -u _rspamd -g _rspamd \