aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-02 13:32:28 +0100
committerHenrik Nord <[email protected]>2016-03-02 13:37:07 +0100
commit52da57c29bc18ff103cb5382625342b4a8f0c7cf (patch)
treea4f98bb9847ff98883822fcf525167de5a5c1f80 /lib/ssl/doc/src
parent1717a8f9e04e6dbfed5921bea1e27ed748ad278f (diff)
parentfac6b24525a1e5f3e50ee9cbdb4daae2ea457f51 (diff)
downloadotp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.tar.gz
otp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.tar.bz2
otp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.zip
Merge branch 'legoscia/tls_ipv6_dist' into maint
* legoscia/tls_ipv6_dist: Add inet6_tls_dist, for TLS distribution over IPv6 Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl OTP-13391
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/ssl_distribution.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index a347ce5ae6..dc04d446b0 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -271,4 +271,27 @@ Eshell V5.0 (abort with ^G)
<p>The <c>init:get_arguments()</c> call verifies that the correct
arguments are supplied to the emulator.</p>
</section>
+
+ <section>
+ <title>Using SSL distribution over IPv6</title>
+ <p>It is possible to use SSL distribution over IPv6 instead of
+ IPv4. To do this, pass the option <c>-proto_dist inet6_tls</c>
+ instead of <c>-proto_dist inet_tls</c> when starting Erlang,
+ either on the command line or in the <c>ERL_FLAGS</c> environment
+ variable.</p>
+
+ <p>An example command line with this option would look like this:</p>
+ <code type="none">
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet6_tls
+ -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem"
+ -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true
+ -sname ssl_test
+Erlang (BEAM) emulator version 5.0 [source]
+
+Eshell V5.0 (abort with ^G)
+(ssl_test@myhost)1> </code>
+
+ <p>A node started in this way will only be able to communicate with
+ other nodes using SSL distribution over IPv6.</p>
+ </section>
</chapter>