diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-28 15:05:55 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-28 15:05:55 +0100 |
| commit | 78759491b8cb7f4d006bd021fcc0cb0dde08e413 (patch) | |
| tree | f02544bb60347224cf86a49133b4ae10eb1ab72d /packaging/common | |
| parent | 20710489718efdf22412bb0316957719f0783059 (diff) | |
| parent | ca1ad94464bde375a054162e2ee91a688ab9e7dd (diff) | |
| download | rabbitmq-server-git-78759491b8cb7f4d006bd021fcc0cb0dde08e413.tar.gz | |
Merging default into bug24004
Diffstat (limited to 'packaging/common')
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 3 | ||||
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index f3bdc3d2ad..d8a7a94d56 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -28,6 +28,7 @@ INIT_LOG_DIR=/var/log/rabbitmq LOCK_FILE= # This is filled in when building packages test -x $DAEMON || exit 0 +test -x $CONTROL || exit 0 RETVAL=0 set -e @@ -94,7 +95,7 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - $DAEMON rotate_logs ${ROTATE_SUFFIX} + $CONTROL rotate_logs ${ROTATE_SUFFIX} if [ $? != 0 ] ; then RETVAL=1 fi diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index 94999d0edf..d58c48ed52 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -103,9 +103,9 @@ The IP Port for rabbitmq-server to listen on <parameter name="config_file" unique="0" required="0"> <longdesc lang="en"> -Location of the config file +Location of the config file (without the .config suffix) </longdesc> -<shortdesc lang="en">Config file path</shortdesc> +<shortdesc lang="en">Config file path (without the .config suffix)</shortdesc> <content type="string" default="" /> </parameter> @@ -189,8 +189,8 @@ rabbit_validate_partial() { } rabbit_validate_full() { - if [ ! -z $RABBITMQ_CONFIG_FILE ] && [ ! -e $RABBITMQ_CONFIG_FILE ]; then - ocf_log err "rabbitmq-server config_file $RABBITMQ_CONFIG_FILE does not exist or is not a file"; + if [ ! -z $RABBITMQ_CONFIG_FILE ] && [ ! -e "${RABBITMQ_CONFIG_FILE}.config" ]; then + ocf_log err "rabbitmq-server config_file ${RABBITMQ_CONFIG_FILE}.config does not exist or is not a file"; exit $OCF_ERR_INSTALLED; fi |