Merge default into bug21368

8 files changed, 20 insertions, 157 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 89b73841..fa2844fd 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -29,8 +29,11 @@ prepare:
 	sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|' \
 		SPECS/rabbitmq-server.spec
 
-	cp init.d SOURCES/rabbitmq-server.init
 	cp ${COMMON_DIR}/* SOURCES/
+	sed -i \
+	    -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \
+	    -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \
+	    SOURCES/rabbitmq-server.init
 	cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate
 
 server: prepare
diff --git a/packaging/RPMS/Fedora/init.d b/packaging/common/rabbitmq-server.init
index 21019c70..e71562f8 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/common/rabbitmq-server.init
@@ -8,10 +8,10 @@
 
 ### BEGIN INIT INFO
 # Provides:          rabbitmq-server
-# Default-Start:
-# Default-Stop:
 # Required-Start:    $remote_fs $network
 # Required-Stop:     $remote_fs $network
+# Default-Start:
+# Default-Stop:
 # Description:       RabbitMQ broker
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
@@ -24,13 +24,14 @@ USER=rabbitmq
 NODE_COUNT=1
 ROTATE_SUFFIX=
 
-LOCK_FILE=/var/lock/subsys/$NAME
+DEFAULTS_FILE= # This is filled in when building packages
+LOCK_FILE= # This is filled in when building packages
 
 test -x $DAEMON || exit 0
 
 # Include rabbitmq defaults if available
-if [ -f /etc/sysconfig/rabbitmq ] ; then
-	. /etc/sysconfig/rabbitmq
+if [ -f "$DEFAULTS_FILE" ] ; then
+	. $DEFAULTS_FILE
 fi
 
 RETVAL=0
@@ -41,7 +42,8 @@ start_rabbitmq () {
     $DAEMON start_all ${NODE_COUNT} > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
     case "$?" in
       0)
-        echo SUCCESS && touch $LOCK_FILE
+        echo SUCCESS
+        [ -n "$LOCK_FILE" ] && touch $LOCK_FILE
         RETVAL=0
         ;;
       1)
@@ -52,7 +54,7 @@ start_rabbitmq () {
         echo FAILED - check /var/log/rabbitmq/startup_log, _err
         RETVAL=1
         ;;
-    esac 
+    esac
     set -e
 }
 
@@ -65,7 +67,7 @@ stop_rabbitmq () {
         if [ $RETVAL = 0 ] ; then
             # Try to stop epmd if run by the rabbitmq user
             pkill -u rabbitmq epmd || :
-            rm -rf $LOCK_FILE
+            [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
         else
             echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
         fi
@@ -121,19 +123,14 @@ case "$1" in
         echo -n "Rotating log files for $DESC: "
         rotate_logs_rabbitmq
         ;;
-    force-reload|reload|restart)
-        echo -n "Restarting $DESC: "
-        restart_rabbitmq
-        echo "$NAME."
-        ;;
-    condrestart|try-restart)
+    force-reload|reload|restart|condrestart|try-restart)
         echo -n "Restarting $DESC: "
         restart_rabbitmq
         echo "$NAME."
         ;;
     *)
         echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
-        RETVAL=2
+        RETVAL=1
         ;;
 esac
 
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 7ab8b659..dafaf9ce 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -22,6 +22,10 @@ package: clean
 	tar -zxvf $(DEBIAN_ORIG_TARBALL)
 	cp -r debian $(UNPACKED_DIR)
 	cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/
+	sed -i \
+	    -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/default/rabbitmq|' \
+	    -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \
+	    $(UNPACKED_DIR)/debian/rabbitmq-server.init
 	chmod a+x $(UNPACKED_DIR)/debian/rules
 	UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR)
 	cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING)
diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d
deleted file mode 100644
index 4a7909c5..00000000
--- a/packaging/debs/Debian/debian/init.d
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          rabbitmq
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Description:       RabbitMQ broker
-# Short-Description: Enable AMQP service provided by RabbitMQ broker
-### END INIT INFO
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DAEMON=/usr/sbin/rabbitmq-multi
-NAME=rabbitmq-server
-DESC=rabbitmq-server
-USER=rabbitmq
-NODE_COUNT=1
-ROTATE_SUFFIX=
-
-test -x $DAEMON || exit 0
-
-# Include rabbitmq defaults if available
-if [ -f /etc/default/rabbitmq ] ; then
-	. /etc/default/rabbitmq
-fi
-
-RETVAL=0
-set -e
-
-start_rabbitmq () {
-    set +e
-    $DAEMON start_all ${NODE_COUNT} > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
-    case "$?" in
-      0)
-        echo SUCCESS
-        RETVAL=0
-        ;;
-      1)
-        echo TIMEOUT - check /var/log/rabbitmq/startup_\{log,err\}
-        RETVAL=1
-        ;;
-      *)
-        echo FAILED - check /var/log/rabbitmq/startup_log, _err
-        RETVAL=1
-        ;;
-    esac
-    set -e
-}
-
-stop_rabbitmq () {
-    set +e
-    status_rabbitmq quiet
-    if [ $RETVAL = 0 ] ; then
-        $DAEMON stop_all > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err
-        RETVAL=$?
-        if [ $RETVAL = 0 ] ; then
-            # Try to stop epmd if run by the rabbitmq user
-            pkill -u rabbitmq epmd || :
-        else
-            echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
-        fi
-    else
-        echo No nodes running 
-        RETVAL=0
-    fi
-    set -e
-}
-
-status_rabbitmq() {
-    set +e
-    if [ "$1" != "quiet" ] ; then
-        $DAEMON status 2>&1
-    else
-        $DAEMON status > /dev/null 2>&1
-    fi
-    if [ $? != 0 ] ; then
-        RETVAL=1
-    fi
-    set -e
-}
-
-rotate_logs_rabbitmq() {
-    set +e
-    $DAEMON rotate_logs ${ROTATE_SUFFIX}
-    if [ $? != 0 ] ; then
-        RETVAL=1
-    fi
-    set -e
-}
-
-restart_rabbitmq() {
-    stop_rabbitmq	    
-    start_rabbitmq
-}
-
-case "$1" in
-    start)
-        echo -n "Starting $DESC: "
-        start_rabbitmq
-        echo "$NAME."
-        ;;
-    stop)
-        echo -n "Stopping $DESC: "
-        stop_rabbitmq
-        echo "$NAME."
-        ;;
-    status)
-        status_rabbitmq
-        ;;
-    rotate-logs)
-        echo -n "Rotating log files for $DESC: "
-        rotate_logs_rabbitmq
-        ;;
-    force-reload|restart)
-        echo -n "Restarting $DESC: "
-        restart_rabbitmq
-        echo "$NAME."
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|rotate-logs|restart|force-reload}" >&2
-        RETVAL=1
-        ;;
-esac
-
-exit $RETVAL
diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat
index 8bef4ad2..3540bf2d 100644
--- a/scripts/rabbitmq-activate-plugins.bat
+++ b/scripts/rabbitmq-activate-plugins.bat
@@ -30,10 +30,6 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

-if "%ERLANG_HOME%"=="" (

-    set ERLANG_HOME=%~dp0%..\..\..

-)

-

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index a30c0889..8abf13f1 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -49,10 +49,6 @@ if "%RABBITMQ_NODE_PORT%"=="" (
 set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

 set RABBITMQ_SCRIPT_HOME=%~sdp0%

 

-if "%ERLANG_HOME%"=="" (

-    set ERLANG_HOME=%~dp0%..\..\..

-)

-

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 3b6e4938..bb68ea5b 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -46,10 +46,6 @@ if "%RABBITMQ_NODE_PORT%"=="" (
     set RABBITMQ_NODE_PORT=5672

 )

 

-if "%ERLANG_HOME%"=="" (

-    set ERLANG_HOME=%~dp0%..\..\..

-)

-

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index e4dccfba..5111724f 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -30,10 +30,6 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

-if "%ERLANG_HOME%"=="" (

-    set ERLANG_HOME=%~dp0%..\..\..

-)

-

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************