diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-04-05 14:09:54 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-04-05 14:09:54 +0100 |
| commit | 90ac3681f16f65d7898c6556c8f723cd53a088fd (patch) | |
| tree | c6893a20e2c678d80a85420f17c2b7e19a655835 /packaging/common | |
| parent | cd6405f33d6b1a87cb7f34eeb4809e88b9c6256d (diff) | |
| parent | 6f3333c4c116f5644f0271281cf6490eda3f2f40 (diff) | |
| download | rabbitmq-server-git-90ac3681f16f65d7898c6556c8f723cd53a088fd.tar.gz | |
merge heads
Diffstat (limited to 'packaging/common')
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 8 |
1 files changed, 4 insertions, 4 deletions
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 |