diff options
| -rw-r--r-- | docs/rabbitmq.5.pod | 14 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/init.d | 4 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/init.d | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/docs/rabbitmq.5.pod b/docs/rabbitmq.5.pod index 95416ebf8b..6def480790 100644 --- a/docs/rabbitmq.5.pod +++ b/docs/rabbitmq.5.pod @@ -18,18 +18,18 @@ init.d script), from /etc/rabbitmq/rabbitmq.conf and finally from the built-in default values. For example, for the B<RABBITMQ_NODENAME> setting, B<RABBITMQ_NODENAME> - from the environment is checked first. If it is absent or equal to the - empty string, then + from the environment is checked first. If it is absent or equal to + the empty string, then B<INITD_NODENAME> from /etc/default/rabbitmq is checked next, only if the server is - started through the standard init.d script. If it is also absent or set - equal to the empty string, then + started through the standard init.d script. If it is also absent or + set equal to the empty string, then B<NODENAME> - from /etc/rabbitmq/rabbitmq.conf is checked. If that is also absent or - set equal to the empty string then the default value from the startup - script is used. + from /etc/rabbitmq/rabbitmq.conf is checked. If that is also absent + or set equal to the empty string then the default value from + the startup script is used. The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the environment variable names, with the B<RABBITMQ_> prefix removed. diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index a006a5a7a2..473703d7ac 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -21,7 +21,7 @@ DAEMON=/usr/lib/rabbitmq/bin/$DAEMON_NAME NAME=rabbitmq-server DESC=rabbitmq-server USER=rabbitmq -NODE_COUNT=1 +INITD_NODE_COUNT=1 ROTATE_SUFFIX= LOCK_FILE=/var/lock/subsys/$NAME @@ -39,7 +39,7 @@ cd / start_rabbitmq () { set +e - su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err + su $USER -s /bin/sh -c "$DAEMON start_all ${INITD_NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err case "$?" in 0) echo SUCCESS && touch $LOCK_FILE diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d index 70dd0adf5f..e11c9a0f13 100644 --- a/packaging/debs/Debian/debian/init.d +++ b/packaging/debs/Debian/debian/init.d @@ -13,7 +13,7 @@ DAEMON=/usr/lib/rabbitmq/bin/rabbitmq-multi NAME=rabbitmq-server DESC=rabbitmq-server USER=rabbitmq -NODE_COUNT=1 +INITD_NODE_COUNT=1 ROTATE_SUFFIX= test -x $DAEMON || exit 0 @@ -29,7 +29,7 @@ cd / start_rabbitmq () { set +e - su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err + su $USER -s /bin/sh -c "$DAEMON start_all ${INITD_NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err case "$?" in 0) echo SUCCESS |