diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-25 17:33:07 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-25 17:33:07 +0000 |
| commit | 454e615b02e949e58f48604af1f7a82a362e87cd (patch) | |
| tree | e44cde7787a8edadb55faca4b2361e1749345ebf | |
| parent | 68f615b277cf1c7cbfd548afcd9f6534203a681a (diff) | |
| download | rabbitmq-server-git-454e615b02e949e58f48604af1f7a82a362e87cd.tar.gz | |
Correct test for existance of config file
| -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 |