diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:16:12 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:16:12 +0000 |
| commit | 32b59f88115699f139a15621aaa36c01542c20fe (patch) | |
| tree | 42c4f2769538427fb434a376b9e4d67c926115ab /scripts | |
| parent | 410084826c1d2a8f03a806f3ca417114f788d412 (diff) | |
| download | rabbitmq-server-git-32b59f88115699f139a15621aaa36c01542c20fe.tar.gz | |
Env variable for schema dir
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-env | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 9 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
7 files changed, 17 insertions, 5 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 23b5a4afd0..d61a4faed4 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -40,6 +40,7 @@ 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 +SCHEMA_DIR=${RABBITMQ_HOME}/priv/schema PLUGINS_DIR="${RABBITMQ_HOME}/plugins" IO_THREAD_POOL_SIZE=64 diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index 0ca53013a9..5b1290aee1 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -43,6 +43,7 @@ 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 SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema
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 b/scripts/rabbitmq-env index 8261053a6d..9ee9ae9dc9 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -186,6 +186,7 @@ DEFAULT_NODE_PORT=5672 [ "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_SCHEMA_DIR" ] && RABBITMQ_SCHEMA_DIR=${SCHEMA_DIR} rmq_normalize_path_var \ RABBITMQ_CONFIG_FILE \ diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index b7a5bb7e52..55f6698635 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -174,6 +174,15 @@ if "!RABBITMQ_CONFIG_ADVANCED!"=="" ( )
)
+if "!RABBITMQ_SCHEMA_DIR!" == "" (
+ if "!SCHEMA_DIR!"=="" (
+ set RABBITMQ_SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema
+ ) else (
+ set RABBITMQ_SCHEMA_DIR=!SCHEMA_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 3b1ecb8af2..088379d20d 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -94,7 +94,7 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \ -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ - -conf_schema_dir ${RABBITMQ_HOME}/priv/schema" + -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}" echo "${RABBITMQ_CONFIG_ADVANCED}.config" if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 923b8277d5..89c9afd1e8 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -52,7 +52,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
- -conf_schema_dir "!RABBITMQ_HOME!\priv\schema" ^
+ -conf_schema_dir !RABBITMQ_SCHEMA_DIR! ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
-extra "!RABBITMQ_NODENAME!"
@@ -73,7 +73,7 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" ( set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
-conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir "!RABBITMQ_HOME!\priv\schema"
+ -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index ae9464d977..7456ade1c0 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -124,7 +124,7 @@ set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!" -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
- -conf_schema_dir "!RABBITMQ_HOME!\priv\schema" ^
+ -conf_schema_dir !RABBITMQ_SCHEMA_DIR! ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
!RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!
@@ -149,7 +149,7 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" ( set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
-conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
- -conf_schema_dir "!RABBITMQ_HOME!\priv\schema"
+ -conf_schema_dir !RABBITMQ_SCHEMA_DIR!
if exist "!RABBITMQ_CONFIG_ADVANCED!.config" (
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
-conf_advanced "!RABBITMQ_CONFIG_ADVANCED!" ^
|