diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-22 15:56:47 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-22 15:56:47 +0000 |
| commit | 51a214d4a707c04670029345f535d7d9549fdb4a (patch) | |
| tree | 178c12fd467458ad1d5233498f23981bd6daf70c | |
| parent | 9dfa7be0933aa9fad6c2dee35ebb1873317b78db (diff) | |
| download | rabbitmq-server-git-51a214d4a707c04670029345f535d7d9549fdb4a.tar.gz | |
Adjust rabbitmq-env.conf location and re-instate ownership decision
| -rw-r--r-- | packaging/generic-unix/rabbitmq-sys | 2 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-sys | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-sys index a89ed33f28..8812f8d22b 100644 --- a/packaging/generic-unix/rabbitmq-sys +++ b/packaging/generic-unix/rabbitmq-sys @@ -29,6 +29,6 @@ MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins OLD_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq.conf -CONF_ENV_FILE=/etc/rabbitmq/rabbitmq-env.conf +CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf PLUGINS_DIR="${RABBITMQ_HOME}/plugins" diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index f60494685b..4124b141ca 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -85,7 +85,7 @@ pre-destroot { } post-destroot { - xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${confdir} + xinstall -d -m 775 ${destroot}${confdir} xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${logdir} xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome} xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir} diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-sys index fc2b25f22c..7b7dfa5905 100644 --- a/scripts/rabbitmq-sys +++ b/scripts/rabbitmq-sys @@ -28,6 +28,6 @@ MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins OLD_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq.conf -CONF_ENV_FILE=/etc/rabbitmq/rabbitmq-env.conf +CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf PLUGINS_DIR="${RABBITMQ_HOME}/plugins" |