diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-13 11:28:55 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-13 11:28:55 +0000 |
| commit | 93dc85d4d90c5561c127e1cca880f21c40dfb3a7 (patch) | |
| tree | e4fa1bd9b4f9718ee1eb5e823cdc1e86ddec2532 | |
| parent | 04dca40199cc18084702da51880abf0618da2e6a (diff) | |
| download | rabbitmq-server-93dc85d4d90c5561c127e1cca880f21c40dfb3a7.tar.gz | |
Ensure rabbitmq-env.conf file is fixed location, even in Generic-Unix case.
| -rw-r--r-- | packaging/generic-unix/rabbitmq-sys | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-sys | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-sys index 00aa7207..a89ed33f 100644 --- a/packaging/generic-unix/rabbitmq-sys +++ b/packaging/generic-unix/rabbitmq-sys @@ -28,7 +28,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins -OLD_CONF_ENV_FILE=${CONFIG_FILE}.conf -CONF_ENV_FILE=${CONFIG_FILE}-env.conf +OLD_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq.conf +CONF_ENV_FILE=/etc/rabbitmq/rabbitmq-env.conf PLUGINS_DIR="${RABBITMQ_HOME}/plugins" diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-sys index 7f76551c..fc2b25f2 100644 --- a/scripts/rabbitmq-sys +++ b/scripts/rabbitmq-sys @@ -27,7 +27,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins -OLD_CONF_ENV_FILE=${CONFIG_FILE}.conf -CONF_ENV_FILE=${CONFIG_FILE}-env.conf +OLD_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq.conf +CONF_ENV_FILE=/etc/rabbitmq/rabbitmq-env.conf PLUGINS_DIR="${RABBITMQ_HOME}/plugins" |