From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 28 Jan 2016 15:12:37 +0000 (+0000)
Subject: Disable reload command in rc scripts
X-Git-Tag: 1.1.2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=869af99b494d89e6d100657db4d5430cc6539f51;p=thirdparty%2Frspamd.git

Disable reload command in rc scripts
---

diff --git a/centos/sources/rspamd.init b/centos/sources/rspamd.init
index ee3365b312..633ed36beb 100644
--- a/centos/sources/rspamd.init
+++ b/centos/sources/rspamd.init
@@ -111,13 +111,6 @@ case "$1" in
     restart|configtest)
         $1
         ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
     status)
         rh_status
         ;;
@@ -126,6 +119,6 @@ case "$1" in
         restart
 	    ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|configtest}"
         exit 2
 esac
diff --git a/debian/rspamd.init b/debian/rspamd.init
index 1a270692e7..784f0ac96b 100644
--- a/debian/rspamd.init
+++ b/debian/rspamd.init
@@ -104,11 +104,6 @@ case "$1" in
   status)
     status_of_proc -p $PIDFILE "$DAEMON" "$NAME" || exit $?
     ;;
-  reload|force-reload)
-    log_daemon_msg "Reloading $DESC" "$NAME"
-    do_reload
-    log_end_msg $?
-    ;;
   reopenlog)
     log_daemon_msg "Reopen logs for $DESC" "$NAME"
     do_reopenlog
@@ -133,7 +128,7 @@ case "$1" in
     esac
     ;;
   *)
-    echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|reopenlog}" >&2
+    echo "Usage: $SCRIPTNAME {start|stop|restart|reopenlog}" >&2
     exit 3
     ;;
 esac
diff --git a/freebsd/rspamd.sh.in b/freebsd/rspamd.sh.in
index c527a6d1d9..c53f0f50b3 100755
--- a/freebsd/rspamd.sh.in
+++ b/freebsd/rspamd.sh.in
@@ -43,7 +43,7 @@ reopenlog_cmd()
    pkill -USR1 -F $rspamd_pidfile
 }
 
-extra_commands="reload configtest reopenlog"
+extra_commands="configtest reopenlog"
 sig_reload="HUP"
 
 command="$procname"