diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-08-01 18:17:39 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-08-01 18:17:39 +0200 |
| commit | 7ec9512aa3fb01004840a446e42477bfd3b57abb (patch) | |
| tree | b5def5dec6e2ad7c5ab361de89361a288d0530f9 /scripts/rabbitmq-script-wrapper | |
| parent | 4d777d21382439bd503b75c19dedb6022b6da34d (diff) | |
| parent | e6c1d41cb649eefa7775a78411c4f38967a2ef46 (diff) | |
| download | rabbitmq-server-git-7ec9512aa3fb01004840a446e42477bfd3b57abb.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'scripts/rabbitmq-script-wrapper')
| -rw-r--r-- | scripts/rabbitmq-script-wrapper | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper index 9e715aad17..4b44f566ba 100644 --- a/scripts/rabbitmq-script-wrapper +++ b/scripts/rabbitmq-script-wrapper @@ -27,14 +27,15 @@ RABBITMQ_SCRIPTS_DIR="$(dirname "$RABBITMQ_ENV")" main() { ensure_we_are_in_a_readable_dir - if current_user_is_rabbitmq + if current_user_is_rabbitmq && calling_rabbitmq_server then - if calling_rabbitmq_server - then - exec_rabbitmq_server "$@" - else - exec_script_as_rabbitmq "$@" - fi + exec_rabbitmq_server "$@" + elif current_user_is_rabbitmq && ! calling_rabbitmq_plugins + then + exec_script_as_rabbitmq "$@" + elif current_user_is_root && calling_rabbitmq_plugins + then + exec_script_as_rabbitmq "$@" elif current_user_is_root then exec_script_as_root @@ -60,6 +61,10 @@ calling_rabbitmq_server() { [ "$SCRIPT" = "rabbitmq-server" ] } +calling_rabbitmq_plugins() { + [ "$SCRIPT" = "rabbitmq-plugins" ] +} + exec_rabbitmq_server() { RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env # RABBITMQ_SCRIPTS_DIR is used in rabbitmq-env |