5 files changed, 36 insertions, 5 deletions
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index 27edd0d11e..9c1a04a005 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -41,6 +41,7 @@ set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq
 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
 
 REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
 for /f "delims=" %%F in ("!TDP0!..\plugins") do set PLUGINS_DIR=%%~dpsF%%~nF%%~xF
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index d402438fb5..9fb31b62e3 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -156,6 +156,14 @@ if "!RABBITMQ_CONFIG_FILE!"=="" (
     )
 )
 
+if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
+    if "!GENERATED_CONFIG_DIR!"=="" (
+        set RABBITMQ_GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
+    ) else (
+        set RABBITMQ_GENERATED_CONFIG_DIR=!GENERATED_CONFIG_DIR!
+    )
+)
+
 REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 if "!RABBITMQ_LOG_BASE!"=="" (
     if "!LOG_BASE!"=="" (
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 9f28086ab4..2a41f3e9cc 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -69,7 +69,7 @@ if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
 else
      
     [ -f "${RABBITMQ_CONFIG_FILE}.conf" ] && 
-    [ "x" != "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && 
+    [ -d $RABBITMQ_GENERATED_CONFIG_DIR ] && 
     generate_config && 
     RABBITMQ_CONFIG_FILE_ACTUAL="${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq"
 fi
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 84908f380f..3fc99becf7 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -41,6 +41,17 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 
 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
+if exist "!RABBITMQ_CONFIG_FILE!.config" (
+    set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
+) else (
+    if exist "!RABBITMQ_CONFIG_FILE!.conf" (
+        del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+        "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+        ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+        set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+    )
+)
+
 "!ERLANG_HOME!\bin\erl.exe" ^
         -pa "!RABBITMQ_EBIN_ROOT!" ^
         -noinput -hidden ^
@@ -58,8 +69,8 @@ if ERRORLEVEL 2 (
 
 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"
 
-if exist "!RABBITMQ_CONFIG_FILE!.config" (
-    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
+if exist "!RABBITMQ_CONFIG_FILE_ACTUAL!.config" (
+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_ACTUAL!"
 ) else (
     set RABBITMQ_CONFIG_ARG=
 )
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 59425540e6..147f9f4d84 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -113,6 +113,17 @@ if errorlevel 1 (
 
 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
+if exist "!RABBITMQ_CONFIG_FILE!.config" (
+    set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
+) else (
+    if exist "!RABBITMQ_CONFIG_FILE!.conf" (
+        del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+        "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+        ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+        set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+    )
+)
+
 "!ERLANG_HOME!\bin\erl.exe" ^
         -pa "!RABBITMQ_EBIN_ROOT!" ^
         -noinput -hidden ^
@@ -131,8 +142,8 @@ if ERRORLEVEL 3 (
     set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
 )
 
-if exist "!RABBITMQ_CONFIG_FILE!.config" (
-    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
+if exist "!RABBITMQ_CONFIG_FILE_ACTUAL!.config" (
+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_ACTUAL!"
 ) else (
     set RABBITMQ_CONFIG_ARG=
 )