diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-23 18:36:57 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-23 18:36:57 +0100 |
| commit | 72f7c8e70028209ee1c58074c087b4d0cb901e6c (patch) | |
| tree | 9cdd46d5aa0a18576ea852bea34866d1f9baf799 /scripts/rabbitmq-env | |
| parent | d616cc922dbd73eca7700c50f09e33e6b578b0d9 (diff) | |
| download | rabbitmq-server-git-72f7c8e70028209ee1c58074c087b4d0cb901e6c.tar.gz | |
Revert "Do not expand plugins anymore"
This broke the management plugin: Cowboy assumes direct file access to
resources in the `priv` directory.
This reverts commits:
7069f3b40daeb5095077bdac19f3837978bc2665
76a8c66c8092cc1c37bb4aa90a0a3d18b27f7d9d
2044cb1eed02e67c4ea749a807694c55ed574756
bc64ac16774aeb403cba87f7e48ad70329dd8b3b
d616cc922dbd73eca7700c50f09e33e6b578b0d9
[#118562759]
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index d3014ecd66..d975f274b2 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -220,6 +220,10 @@ rmq_normalize_path_var RABBITMQ_PID_FILE [ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} +[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} +[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand +rmq_normalize_path_var RABBITMQ_PLUGINS_EXPAND_DIR + [ "x" != "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE_source=environment [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} rmq_normalize_path_var RABBITMQ_ENABLED_PLUGINS_FILE @@ -247,6 +251,7 @@ rmq_check_if_shared_with_mnesia \ RABBITMQ_CONFIG_FILE \ RABBITMQ_LOG_BASE \ RABBITMQ_PID_FILE \ + RABBITMQ_PLUGINS_EXPAND_DIR \ RABBITMQ_ENABLED_PLUGINS_FILE \ RABBITMQ_PLUGINS_DIR \ RABBITMQ_LOGS |