diff options
| author | Alvaro Videla <alvaro@rabbitmq.com> | 2014-04-14 17:55:55 +0200 |
|---|---|---|
| committer | Alvaro Videla <alvaro@rabbitmq.com> | 2014-04-14 17:55:55 +0200 |
| commit | f497cdd83fee1537928331b0c10535b6b382987d (patch) | |
| tree | 161f39fa5ff297ee7c1397a38eddfd8a0e547245 | |
| parent | 0a960a077f8cdf09145e6cd4ba534a63e5fd2b5e (diff) | |
| download | rabbitmq-server-bug24351.tar.gz | |
adds SSL dist support for unixbug24351
| -rwxr-xr-x | scripts/rabbitmq-server | 9 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 03cd80e1..a1b23cd4 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -61,6 +61,13 @@ DEFAULT_NODE_PORT=5672 ##--- End of overridden <var_name> variables +## SSL Dist Options +RABBITMQ_SSL_DIST_PA="" +if [ "x" != "x$RABBITMQ_SSL_DIST_ARGS" ]; then + RABBITMQ_SSL_DIST_PA="-pa "`${ERL_DIR}erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell` + RABBITMQ_SSL_DIST_ARGS="$RABBITMQ_SSL_DIST_ARGS -proto_dist inet_tls" +fi + RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput" [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot " @@ -118,6 +125,8 @@ set -f exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ + ${RABBITMQ_SSL_DIST_PA} \ + "${RABBITMQ_SSL_DIST_ARGS}" \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ -boot "${SASL_BOOT_FILE}" \ diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index ff9cb7fa..e659dac8 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -26,8 +26,17 @@ ##--- End of overridden <var_name> variables +## SSL Dist Options +RABBITMQ_SSL_DIST_PA="" +if [ "x" != "x$RABBITMQ_SSL_DIST_ARGS" ]; then + RABBITMQ_SSL_DIST_PA="-pa "`${ERL_DIR}erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell` + RABBITMQ_SSL_DIST_ARGS="$RABBITMQ_SSL_DIST_ARGS -proto_dist inet_tls" +fi + exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ + ${RABBITMQ_SSL_DIST_PA} \ + "${RABBITMQ_SSL_DIST_ARGS}" \ -noinput \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ |