Revert "Disable reload command in rc scripts"

This reverts commit 869af99b494d89e6d100657db4d5430cc6539f51.

diff --git a/centos/sources/rspamd.init b/centos/sources/rspamd.init
index 633ed36beb3d2479b1441a32ebc5c2d17c8e8fb7..ee3365b3121ad0c207316f2150b1c1e3ffca9073 100644 (file)
--- a/centos/sources/rspamd.init
+++ b/centos/sources/rspamd.init
@@ -111,6 +111,13 @@ case "$1" in
     restart|configtest)
         $1
         ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
     status)
         rh_status
         ;;
@@ -119,6 +126,6 @@ case "$1" in
         restart
            ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|configtest}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
         exit 2
 esac

diff --git a/debian/rspamd.init b/debian/rspamd.init
index 784f0ac96babd1dd2df571d835837360467c4249..1a270692e74a32ce6fa2ff77dff5e5b4ac0067c5 100644 (file)
--- a/debian/rspamd.init
+++ b/debian/rspamd.init
@@ -104,6 +104,11 @@ 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
@@ -128,7 +133,7 @@ case "$1" in
     esac
     ;;
   *)
-    echo "Usage: $SCRIPTNAME {start|stop|restart|reopenlog}" >&2
+    echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|reopenlog}" >&2
     exit 3
     ;;
 esac

diff --git a/freebsd/rspamd.sh.in b/freebsd/rspamd.sh.in
index c53f0f50b3e54968b7ff2fcafb4428b8db86a64f..c527a6d1d9245ebfcf9fe4ecc2165ebd04d4e820 100755 (executable)
--- a/freebsd/rspamd.sh.in
+++ b/freebsd/rspamd.sh.in
@@ -43,7 +43,7 @@ reopenlog_cmd()
    pkill -USR1 -F $rspamd_pidfile
 }
 
-extra_commands="configtest reopenlog"
+extra_commands="reload configtest reopenlog"
 sig_reload="HUP"
 
 command="$procname"