diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-16 10:37:41 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-16 10:37:41 +0100 |
| commit | 4b7048205d1afa80bb0d644acb90e13106b2b8c1 (patch) | |
| tree | 065fe80709e4e16cda4633fea521c9ef71046ea0 /scripts/rabbitmq-script-wrapper | |
| parent | ba19ba552b0a6e1a9297feda3b78c192b0523f77 (diff) | |
| download | rabbitmq-server-git-4b7048205d1afa80bb0d644acb90e13106b2b8c1.tar.gz | |
packaging: Don't load rabbitmq-env from init scripts
This was used to define `$RABBITMQ_LOG_BASE`, but this variable is no
longer define there.
rabbitmq-env would also load `rabbitmq-env.conf` which could redefine
`$RABBITMQ_LOG_BASE`, but this is a corner case and doesn't fit
packaging well: packages already prepare a location for log files and
will clean this location up on removal.
Now, we set `$RABBITMQ_LOG_BASE` value in those scripts and get rid of
rabbitmq-env load.
Diffstat (limited to 'scripts/rabbitmq-script-wrapper')
| -rw-r--r-- | scripts/rabbitmq-script-wrapper | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper index 4acba9d2d3..d592c40108 100644 --- a/scripts/rabbitmq-script-wrapper +++ b/scripts/rabbitmq-script-wrapper @@ -12,12 +12,11 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## SCRIPT="$(basename "$0")" -RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env -RABBITMQ_SCRIPTS_DIR="$(dirname "$RABBITMQ_ENV")" +RABBITMQ_LOG_BASE=/var/log/rabbitmq main() { ensure_we_are_in_a_readable_dir @@ -72,13 +71,6 @@ calling_rabbitmq_plugins() { } exec_rabbitmq_server() { - RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env - # RABBITMQ_SCRIPTS_DIR is used in rabbitmq-env - # shellcheck disable=SC2034 - RABBITMQ_SCRIPTS_DIR="$(dirname "$RABBITMQ_ENV")" - # shellcheck source=/dev/null - . "$RABBITMQ_ENV" - exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ } |