rename env variable CONFIG_ADVANCED to ADVANCED_CONFIG_FILE

7 files changed, 19 insertions, 20 deletions

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index d61a4faed4..bccd0d7435 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -39,7 +39,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
 ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
 GENERATED_CONFIG_DIR=${SYS_PREFIX}/var/lib/rabbitmq/config
-CONFIG_ADVANCED=${SYS_PREFIX}/etc/rabbitmq/advanced
+ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced
 SCHEMA_DIR=${RABBITMQ_HOME}/priv/schema
 
 PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index 5b1290aee1..5612af967a 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -42,7 +42,7 @@ set LOG_BASE=!RABBITMQ_BASE!\log
 set MNESIA_BASE=!RABBITMQ_BASE!\db

 set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

 set GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config

-set CONFIG_ADVANCED=!RABBITMQ_BASE!\advanced

+set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

 set SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema

 

 REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 9ee9ae9dc9..8ceb8c94f2 100644
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -185,7 +185,7 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
 [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
 [ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR}
-[ "x" = "x$RABBITMQ_CONFIG_ADVANCED" ] && RABBITMQ_CONFIG_ADVANCED=${CONFIG_ADVANCED}
+[ "x" = "x$RABBITMQ_ADVANCED_CONFIG_FILE" ] && RABBITMQ_ADVANCED_CONFIG_FILE=${ADVANCED_CONFIG_FILE}
 [ "x" = "x$RABBITMQ_SCHEMA_DIR" ] && RABBITMQ_SCHEMA_DIR=${SCHEMA_DIR}
 
 rmq_normalize_path_var \
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 55f6698635..430395accf 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -166,11 +166,11 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
     )

 )

 

-if "!RABBITMQ_CONFIG_ADVANCED!"=="" (

-    if "!CONFIG_ADVANCED!"=="" (

-        set RABBITMQ_CONFIG_ADVANCED=!RABBITMQ_BASE!\advanced

+if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (

+    if "!ADVANCED_CONFIG_FILE!"=="" (

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

     ) else (

-        set RABBITMQ_CONFIG_ADVANCED=!GENERATED_CONFIG_DIR!

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!GENERATED_CONFIG_DIR!

     )

 )

 

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index da76b4708e..9a4f1d5cbd 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -68,7 +68,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     -hidden \
     -s rabbit_prelaunch \
     ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \
-    -conf_advanced "${RABBITMQ_CONFIG_ADVANCED}" \
+    -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \
     -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
     -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
     -extra "${RABBITMQ_NODENAME}"
@@ -97,11 +97,10 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
                          -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
                          -conf_script_dir `dirname $0` \
                          -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
-    echo "${RABBITMQ_CONFIG_ADVANCED}.config"
-    if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then
+    if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then
         RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \
-                             -conf_advanced ${RABBITMQ_CONFIG_ADVANCED} \
-                             -config ${RABBITMQ_CONFIG_ADVANCED}"
+                             -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
+                             -config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
     fi
 fi
 
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 2073fe0ed7..f5cad1e12c 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -49,7 +49,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"
         -noinput -hidden ^

         -s rabbit_prelaunch ^

         !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^

-        -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!"  ^

+        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"  ^

         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

         -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

         -extra "!RABBITMQ_NODENAME!"

@@ -75,10 +75,10 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
                             -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

                             -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

                             -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

-    if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (

+    if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (

         set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^

-                                -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^

-                                -config "!RABBITMQ_CONFIG_ADVANCED!"

+                                -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

+                                -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

     )

 ) 

 

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 29823db2f1..473486d8ae 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -121,7 +121,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"
         -pa "!RABBITMQ_EBIN_ROOT!" ^

         -noinput -hidden ^

         -s rabbit_prelaunch ^

-        -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^

+        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

         -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^

         !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!

@@ -151,10 +151,10 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
                             -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

                             -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

                             -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

-    if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (

+    if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (

         set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^

-                                -conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^

-                                -config "!RABBITMQ_CONFIG_ADVANCED!"

+                                -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

+                                -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

     )

 )