Skip to content

[DOCS] Fix TLS/SSL deprecated macros for Asciidoctor #42440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2019
Merged

[DOCS] Fix TLS/SSL deprecated macros for Asciidoctor #42440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/reference/settings/security-settings.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,9 +1253,14 @@ through the list of URLs will continue until a successful connection is made.
[[ssl-tls-settings]]
==== Default TLS/SSL settings

ifdef::asciidoctor[]
deprecated:[6.7.0, "fallback to the default TLS/SSL settings is deprecated as it leads to ambiguity in what configuration is used. Fully configure each components' TLS/SSL settings as the default settings will be removed in 7.0"]
endif::[]
ifndef::asciidoctor[]
deprecated[6.7.0, fallback to the default TLS/SSL settings is deprecated as it
leads to ambiguity in what configuration is used. Fully configure each components'
TLS/SSL settings as the default settings will be removed in 7.0]
endif::[]

You can configure the following TLS/SSL settings in
`elasticsearch.yml`. For more information, see
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/settings/ssl-settings.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@

==== {component} TLS/SSL Settings
ifeval::["{component}"=="Auditing"]
ifdef::asciidoctor[]
deprecated:[6.7.0, "These settings configure the client used by the index audit output type which is deprecated and will be removed in 7.0. All the settings under the `xpack.security.audit.index` namespace are deprecated."]
endif::[]
ifndef::asciidoctor[]
deprecated[6.7.0, These settings configure the client used by the index audit
output type which is deprecated and will be removed in 7.0. All the settings
under the `xpack.security.audit.index` namespace are deprecated.]
endif::[]
endif::[]

You can configure the following TLS/SSL settings. If the settings are not configured,
the {ref}/security-settings.html#ssl-tls-settings[Default TLS/SSL Settings]
Expand Down