Skip to content

Commit ccc6f9c

Browse files
authored
docs: SSL -> TLS (#22)
1 parent c71ce15 commit ccc6f9c

File tree

22 files changed

+56
-56
lines changed

22 files changed

+56
-56
lines changed

docs/_static/double_proxy.svg

Lines changed: 1 addition & 1 deletion
Loading

docs/_static/front_proxy.svg

Lines changed: 1 addition & 1 deletion
Loading

docs/configuration/cluster_manager/cluster.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ max_retries
116116
<arch_overview_circuit_break>` for more information.
117117

118118
:ref:`ssl_context <config_cluster_manager_cluster_ssl>`
119-
*(optional, object)* The SSL configuration for connections to the upstream cluster. If no SSL
120-
configuration is specified, SSL will not be used for new connections.
119+
*(optional, object)* The TLS configuration for connections to the upstream cluster. If no TLS
120+
configuration is specified, TLS will not be used for new connections.
121121

122122
.. _config_cluster_manager_cluster_features:
123123

@@ -128,7 +128,7 @@ features
128128
http2
129129
If *http2* is specified, Envoy will assume that the upstream supports HTTP/2 when making new
130130
HTTP connection pool connections. Currently, Envoy only supports prior knowledge for upstream
131-
connections. Even if SSL is used with ALPN, *http2* must be specified. As an aside this allows
131+
connections. Even if TLS is used with ALPN, *http2* must be specified. As an aside this allows
132132
HTTP/2 connections to happen over plain text.
133133

134134
.. _config_cluster_manager_cluster_http_codec_options:

docs/configuration/cluster_manager/cluster_ssl.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. _config_cluster_manager_cluster_ssl:
22

3-
SSL context
3+
TLS context
44
===========
55

66
.. code-block:: json
@@ -27,7 +27,7 @@ alpn_protocols
2727

2828
cert_chain_file
2929
*(optional, string)* The certificate chain file that should be served by the connection. This is
30-
used to provide a client side SSL certificate to an upstream host.
30+
used to provide a client side TLS certificate to an upstream host.
3131

3232
private_key_file
3333
*(optional, string)* The private key that corresponds to the certificate chain file.
@@ -45,9 +45,9 @@ verify_subject_alt_name
4545
name matches the specified value.
4646

4747
cipher_suites
48-
*(optional, string)* If specified, the SSL connection will only support the specified cipher list.
48+
*(optional, string)* If specified, the TLS connection will only support the specified cipher list.
4949
If not specified, a default list will be used.
5050

5151
sni
52-
*(optional, string)* If specified, the string will be presented as the SNI during the SSL
52+
*(optional, string)* If specified, the string will be presented as the SNI during the TLS
5353
handshake.

docs/configuration/http_conn_man/headers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Internal services often want to know which service is calling them. This header
4747
external requests, but for internal requests will contain the service cluster of the caller. Note
4848
that in the current implementation, this should be considered a hint as it is set by the caller and
4949
could be easily spoofed by any internal entity. In the future Envoy will support a mutual
50-
authentication SSL mesh which will make this header fully secure. Like *user-agent*, the value
50+
authentication TLS mesh which will make this header fully secure. Like *user-agent*, the value
5151
is determined by the :option:`--service-cluster` command line option.
5252

5353
.. _config_http_conn_man_headers_x-envoy-external-address:

docs/configuration/http_conn_man/http_conn_man.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ codec_type
3737

3838
http2
3939
The connection manager will assume that the client is speaking HTTP/2 (Envoy does not require
40-
HTTP/2 to take place over SSL or to use ALPN. Prior knowledge is allowed).
40+
HTTP/2 to take place over TLS or to use ALPN. Prior knowledge is allowed).
4141

4242
auto
4343
For every new connection, the connection manager will determine which codec to use. This mode
44-
supports both ALPN for SSL listeners as well as protocol inference for plaintext listeners.
44+
supports both ALPN for TLS listeners as well as protocol inference for plaintext listeners.
4545
If ALPN data is available, it is preferred, otherwise protocol inference is used. In almost
4646
all cases, this is the right option to choose for this setting.
4747

docs/configuration/http_conn_man/route_config/vhost.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ domains
3434
The first route that matches will be used.
3535

3636
require_ssl
37-
*(optional, string)* Specifies the type of SSL enforcement the virtual host expects. Possible
37+
*(optional, string)* Specifies the type of TLS enforcement the virtual host expects. Possible
3838
values are:
3939

4040
all
41-
All requests must use SSL. If a request is not using SSL, a 302 redirect will be sent telling
41+
All requests must use TLS. If a request is not using TLS, a 302 redirect will be sent telling
4242
the client to use HTTPS.
4343

4444
external_only
45-
External requests must use SSL. If a request is external and it is not using SSL, a 302 redirect
45+
External requests must use TLS. If a request is external and it is not using TLS, a 302 redirect
4646
will be sent telling the client to use HTTPS.
4747

48-
If this option is not specified, there is no SSL requirement for the virtual host.
48+
If this option is not specified, there is no TLS requirement for the virtual host.
4949

5050
:ref:`virtual_clusters <config_http_conn_man_route_table_vcluster>`
5151
*(optional, array)* A list of virtual clusters defined for this virtual host. Virtual clusters

docs/configuration/http_conn_man/stats.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ statistics:
1111
:widths: 1, 1, 2
1212

1313
downstream_cx_total, Counter, Total connections
14-
downstream_cx_ssl_total, Counter, Total SSL connections
14+
downstream_cx_ssl_total, Counter, Total TLS connections
1515
downstream_cx_http1_total, Counter, Total HTTP/1.1 connections
1616
downstream_cx_http2_total, Counter, Total HTTP/2 connections
1717
downstream_cx_destroy, Counter, Total connections destroyed
@@ -21,7 +21,7 @@ statistics:
2121
downstream_cx_destroy_local_active_rq, Counter, Total connections destroyed locally with 1+ active request
2222
downstream_cx_destroy_remote_active_rq, Counter, Total connections destroyed remotely with 1+ active request
2323
downstream_cx_active, Gauge, Total active connections
24-
downstream_cx_ssl_active, Gauge, Total active SSL connections
24+
downstream_cx_ssl_active, Gauge, Total active TLS connections
2525
downstream_cx_http1_active, Gauge, Total active HTTP/1.1 connections
2626
downstream_cx_http2_active, Gauge, Total active HTTP/2 connections
2727
downstream_cx_protocol_error, Counter, Total protocol errors

docs/configuration/listeners/listeners.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ port
2525
filters are processed sequentially as connection events happen.
2626

2727
:ref:`ssl_context <config_listener_ssl_context>`
28-
*(optional, object)* The :ref:`SSL <arch_overview_ssl>` context configuration for an SSL listener.
29-
If no SSL context block is defined, the listener is a plain text listener.
28+
*(optional, object)* The :ref:`TLS <arch_overview_ssl>` context configuration for a TLS listener.
29+
If no TLS context block is defined, the listener is a plain text listener.
3030

3131
use_proxy_proto
3232
*(optional, boolean)* Whether the listener should expect a

docs/configuration/listeners/ssl.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _config_listener_ssl_context:
22

3-
SSL context
3+
TLS context
44
===========
55

6-
SSL :ref:`architecture overview <arch_overview_ssl>`.
6+
TLS :ref:`architecture overview <arch_overview_ssl>`.
77

88
.. code-block:: json
99
@@ -53,5 +53,5 @@ verify_subject_alt_name
5353
name matches the specified value.
5454

5555
cipher_suites
56-
*(optional, string)* If specified, the SSL listener will only support the specified cipher list.
56+
*(optional, string)* If specified, the TLS listener will only support the specified cipher list.
5757
If not specified, a default list will be used.

0 commit comments

Comments
 (0)