diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2013-07-22 21:19:34 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2013-07-22 21:19:34 +0200 |
| commit | 19aee057841b02b1e874794cb85be776ea854780 (patch) | |
| tree | 591028eeeabf07b87488d8115aa7c411ce2be0e1 | |
| parent | 2a8d8e75a5049aa3e88e4142165e31d081dca378 (diff) | |
| download | rabbitmq-server-19aee057841b02b1e874794cb85be776ea854780.tar.gz | |
introduces ssl_apps as a env parameter
| -rw-r--r-- | ebin/rabbit_app.in | 5 | ||||
| -rw-r--r-- | packaging/standalone/src/rabbit_release.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 635869a2..5822078b 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -68,5 +68,8 @@ rabbit_exchange_type_fanout, rabbit_exchange_type_topic, mnesia, mnesia_lib, rpc, mnesia_tm, qlc, sofs, proplists, credit_flow, pmon, ssl_connection, tls_connection, ssl_record, tls_record, - gen_fsm, ssl]} + gen_fsm, ssl]}, + %% see bug 25668 about why we need these + {ssl_apps, + [asn1, crypto, public_key, ssl]} ]}]}. diff --git a/packaging/standalone/src/rabbit_release.erl b/packaging/standalone/src/rabbit_release.erl index 26f36d68..9473cbda 100644 --- a/packaging/standalone/src/rabbit_release.erl +++ b/packaging/standalone/src/rabbit_release.erl @@ -54,7 +54,9 @@ start() -> end, %% we need a list of ERTS apps we need to ship with rabbit - BaseApps = AllApps -- PluginAppNames, + {ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps), + + BaseApps = SslAppsConfig ++ AllApps -- PluginAppNames, AppVersions = [determine_version(App) || App <- BaseApps], RabbitVersion = proplists:get_value(rabbit, AppVersions), diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 702df040..ebbedab8 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -145,7 +145,8 @@ start() -> rabbit_sup:start_supervisor_child( {rabbit_connection_sup,start_link,[]}]). ensure_ssl() -> - ok = app_utils:start_applications([asn1, crypto, public_key, ssl]), + {ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps), + ok = app_utils:start_applications(SslAppsConfig), {ok, SslOptsConfig} = application:get_env(rabbit, ssl_options), % unknown_ca errors are silently ignored prior to R14B unless we |