diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-14 18:14:39 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-14 18:14:39 +0100 |
| commit | 5f675aaaf2c9161c26c406d834f82fb070e2f12e (patch) | |
| tree | 589c9b26e993839b306e04111b37ce4054c4bb95 /scripts | |
| parent | e9ce0fa5c6426a7baca4171f72b99bf0183f8071 (diff) | |
| download | rabbitmq-server-git-5f675aaaf2c9161c26c406d834f82fb070e2f12e.tar.gz | |
SCHEMA_DIR set to writable location by default
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-defaults | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
5 files changed, 14 insertions, 2 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 1505ce0f00..494f20af2b 100755 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -40,7 +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 ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced -SCHEMA_DIR=${RABBITMQ_HOME}/priv/schema +SCHEMA_DIR=${SYS_PREFIX}/etc/rabbitmq/schema PLUGINS_DIR="${RABBITMQ_HOME}/plugins" diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index 6919ca6a4e..0246dc64fd 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -43,7 +43,7 @@ set MNESIA_BASE=!RABBITMQ_BASE!\db set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins
set GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
-set SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema
+set SCHEMA_DIR=!RABBITMQ_BASE!\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-server b/scripts/rabbitmq-server index 507a3ebfd9..8a6279dc65 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -94,6 +94,10 @@ else exit ${PRELAUNCH_RESULT} fi +if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then + mkdir "${RABBITMQ_SCHEMA_DIR}" +fi + if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}" fi diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index d87dc9d5fb..20a0bd8823 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -65,6 +65,10 @@ if ERRORLEVEL 2 ( set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
)
+if not exist "!RABBITMQ_SCHEMA_DIR!" (
+ mkdir "!RABBITMQ_SCHEMA_DIR!"
+)
+
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 8a77fa1769..2fb34ddb28 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -151,6 +151,10 @@ if ERRORLEVEL 3 ( set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
)
+if not exist "!RABBITMQ_SCHEMA_DIR!" (
+ mkdir "!RABBITMQ_SCHEMA_DIR!"
+)
+
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
)
|