Restore "Do not expand plugins anymore"

Support for reading static files from Erlang .ez archives was added to
Cowboy and various RabbitMQ plugins were updated to take advantage of
the new API.

So this commit restores the following commits:
    7069f3b40daeb5095077bdac19f3837978bc2665
    76a8c66c8092cc1c37bb4aa90a0a3d18b27f7d9d
    2044cb1eed02e67c4ea749a807694c55ed574756
    bc64ac16774aeb403cba87f7e48ad70329dd8b3b
    d616cc922dbd73eca7700c50f09e33e6b578b0d9

They were reverted in 72f7c8e70028209ee1c58074c087b4d0cb901e6c because
Cowboy didn't have this support at the time.

Signed-off-by: Gerhard Lazu <gerhard@rabbitmq.com>

[#118562759, #136622317]

5 files changed, 0 insertions, 22 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index f1624eddf9..e9e83f6313 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -220,10 +220,6 @@ 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
@@ -253,7 +249,6 @@ 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 \
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 56b2f69b2d..9426019003 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -262,20 +262,6 @@ if "!RABBITMQ_BOOT_MODULE!"=="" (
     )

 )

 

-REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}

-REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand

-if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" (

-    if "!PLUGINS_EXPAND_DIR!"=="" (

-        set RABBITMQ_PLUGINS_EXPAND_DIR=!RABBITMQ_MNESIA_BASE!\!RABBITMQ_NODENAME!-plugins-expand

-    ) else (

-        set RABBITMQ_PLUGINS_EXPAND_DIR=!PLUGINS_EXPAND_DIR!

-    )

-)

-REM FIXME: RabbitMQ removes and recreates RABBITMQ_PLUGINS_EXPAND_DIR

-REM itself. Therefore we can't create it here in advance and escape the

-REM directory name, and RABBITMQ_PLUGINS_EXPAND_DIR must not contain

-REM non-US-ASCII characters.

-

 REM [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE}

 if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (

     if "!ENABLED_PLUGINS_FILE!"=="" (

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 41d1a81332..655fdc3bcb 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -221,7 +221,6 @@ start_rabbitmq_server() {
         -rabbit lager_handler_upgrade "$RABBITMQ_LAGER_HANDLER_UPGRADE" \
         -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
         -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
-        -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
         -os_mon start_cpu_sup false \
         -os_mon start_disksup false \
         -os_mon start_memsup false \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index de25f95bdf..a51a327fa5 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -180,7 +180,6 @@ if "!ENV_OK!"=="false" (
 -rabbit lager_handler !RABBIT_LAGER_HANDLER! ^

 -rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^

 -rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

--rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

 -os_mon start_cpu_sup false ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 624d18d913..29e7068ab1 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -257,7 +257,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -rabbit lager_handler !RABBIT_LAGER_HANDLER! ^

 -rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^

 -rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

--rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

 -rabbit windows_service_config \""!RABBITMQ_CONFIG_FILE:\=/!"\" ^

 -os_mon start_cpu_sup false ^

 -os_mon start_disksup false ^