summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Gusarov <dottedmag@debian.org>2015-03-07 10:53:16 +0000
committerAndrew Lewis <nerf@judo.za.org>2015-03-11 19:37:16 +0200
commitd28ce79cb23b14ff5b0752cfef7c2717c750f73c (patch)
tree0677a76171a66d8359f8baa287313e8a8550f95e
parentdc40269226c5116db1e45d936785ee4973e4557e (diff)
downloadrspamd-d28ce79cb23b14ff5b0752cfef7c2717c750f73c.tar.gz
rspamd-d28ce79cb23b14ff5b0752cfef7c2717c750f73c.zip
Use rspamd.sysvinit.conf for sysvinit init scripts
-rw-r--r--centos/sources/rspamd.init4
-rwxr-xr-xdebian/rspamd.init2
-rw-r--r--linux/rspamd_rh.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/centos/sources/rspamd.init b/centos/sources/rspamd.init
index f3fc9124e..c91aa0eee 100644
--- a/centos/sources/rspamd.init
+++ b/centos/sources/rspamd.init
@@ -14,7 +14,7 @@
# chkconfig: - 85 15
# description: rspamd is a spam filtering system
# processname: rspamd
-# config: /etc/rspamd/rspamd.conf
+# config: /etc/rspamd/rspamd.sysvinit.conf
# config: /etc/sysconfig/rspamd
# pidfile: /var/run/rspamd/rspamd.pid
@@ -30,7 +30,7 @@
rspamd="/usr/bin/rspamd"
prog=$(basename $rspamd)
-RSPAMD_CONF_FILE="/etc/rspamd/rspamd.conf"
+RSPAMD_CONF_FILE="/etc/rspamd/rspamd.sysvinit.conf"
RSPAMD_USER="rspamd"
RSPAMD_GROUP="rspamd"
diff --git a/debian/rspamd.init b/debian/rspamd.init
index b531304e4..07eba1bd6 100755
--- a/debian/rspamd.init
+++ b/debian/rspamd.init
@@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Rspamd"
NAME=rspamd
DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-c /etc/rspamd/rspamd.conf"
+DAEMON_ARGS="-c /etc/rspamd/rspamd.sysvinit.conf"
DESC="rapid spam filtering system"
PIDFILE=/run/rspamd/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
diff --git a/linux/rspamd_rh.in b/linux/rspamd_rh.in
index 56cea9651..bf8e7106c 100644
--- a/linux/rspamd_rh.in
+++ b/linux/rspamd_rh.in
@@ -21,7 +21,7 @@
rspamd="/usr/bin/rspamd"
prog=$(basename $rspamd)
-RSPAMD_CONF_FILE="/etc/rspamd/rspamd"
+RSPAMD_CONF_FILE="/etc/rspamd/rspamd.sysvinit.conf"
RSPAMD_USER="rspamd"
RSPAMD_GROUP="rspamd"