Skip to content

Commit d5b59d5

Browse files
committed
Revert "[DOCS] Set explicit anchors for TLS/SSL settings (#42524)"
This reverts commit 7d2ff99.
1 parent 88284ea commit d5b59d5

File tree

4 files changed

+1
-22
lines changed

4 files changed

+1
-22
lines changed

docs/reference/settings/monitoring-settings.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,5 @@ For example: `["elasticsearch_version_mismatch","xpack_license_expiration"]`.
280280
:component: {monitoring}
281281
:verifies:
282282
:server!:
283-
:ssl-context: monitoring
284283

285284
include::ssl-settings.asciidoc[]

docs/reference/settings/notification-settings.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ Specifies the maximum size an HTTP response is allowed to have, defaults to
7171
:component: {watcher}
7272
:verifies:
7373
:server!:
74-
:ssl-context: watcher
7574

7675
include::ssl-settings.asciidoc[]
7776

docs/reference/settings/security-settings.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,6 @@ http layer.
14261426
:client-auth-default: none
14271427
:verifies!:
14281428
:server:
1429-
:ssl-context: security-http
14301429

14311430
include::ssl-settings.asciidoc[]
14321431

@@ -1436,7 +1435,6 @@ include::ssl-settings.asciidoc[]
14361435
:client-auth-default!:
14371436
:verifies:
14381437
:server:
1439-
:ssl-context: security-transport
14401438

14411439
include::ssl-settings.asciidoc[]
14421440

docs/reference/settings/ssl-settings.asciidoc

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
==== {component} TLS/SSL Settings
23
You can configure the following TLS/SSL settings. If the settings are not configured,
34
the {ref}/security-settings.html#ssl-tls-settings[Default TLS/SSL Settings]
@@ -40,13 +41,7 @@ Supported cipher suites can be found in Oracle's http://docs.oracle.com/javase/8
4041
Java Cryptography Architecture documentation]. Defaults to the value of
4142
`xpack.ssl.cipher_suites`.
4243

43-
ifdef::asciidoctor[]
44-
[#{ssl-context}-tls-ssl-key-trusted-certificate-settings]
4544
===== {component} TLS/SSL Key and Trusted Certificate Settings
46-
endif::[]
47-
ifndef::asciidoctor[]
48-
===== anchor:{ssl-context}-tls-ssl-key-trusted-certificate-settings[] {component} TLS/SSL Key and Trusted Certificate Settings
49-
endif::[]
5045

5146
The following settings are used to specify a private key, certificate, and the
5247
trusted certificates that should be used when communicating over an SSL/TLS connection.
@@ -112,13 +107,7 @@ Password to the truststore.
112107
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
113108
Password to the truststore.
114109

115-
ifdef::asciidoctor[]
116-
[#{ssl-context}-pkcs12-files]
117110
===== PKCS#12 Files
118-
endif::[]
119-
ifndef::asciidoctor[]
120-
===== anchor:{ssl-context}-pkcs12-files[] PKCS#12 Files
121-
endif::[]
122111

123112
{es} can be configured to use PKCS#12 container files (`.p12` or `.pfx` files)
124113
that contain the private key, certificate and certificates that should be trusted.
@@ -156,13 +145,7 @@ Password to the PKCS#12 file.
156145
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
157146
Password to the PKCS#12 file.
158147

159-
ifdef::asciidoctor[]
160-
[#{ssl-context}-pkcs11-tokens]
161148
===== PKCS#11 Tokens
162-
endif::[]
163-
ifndef::asciidoctor[]
164-
===== anchor:{ssl-context}-pkcs11-tokens[] PKCS#11 Tokens
165-
endif::[]
166149

167150
{es} can be configured to use a PKCS#11 token that contains the private key,
168151
certificate and certificates that should be trusted.

0 commit comments

Comments
 (0)