Skip to content

Commit

Permalink
[DOCS] Merges duplicate pages for SAML realms (#49209)
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl committed Nov 18, 2019
1 parent b0b5fcc commit 48f53ef
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 257 deletions.
25 changes: 25 additions & 0 deletions docs/reference/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -920,3 +920,28 @@ See <<native-realm-configuration>>.

See <<ref-native-settings>>.

[role="exclude",id="configuring-saml-realm"]
=== Configuring a SAML realm

See <<saml-guide>>.

[role="exclude",id="saml-settings"]
==== SAML realm settings

See <<ref-saml-settings>>.

[role="exclude",id="_saml_realm_signing_settings"]
==== SAML realm signing settings

See <<ref-saml-signing-settings>>.

[role="exclude",id="_saml_realm_encryption_settings"]
==== SAML realm encryption settings

See <<ref-saml-encryption-settings>>.

[role="exclude",id="_saml_realm_ssl_settings"]
==== SAML realm SSL settings

See <<ref-saml-ssl-settings>>.

230 changes: 0 additions & 230 deletions x-pack/docs/en/security/authentication/configuring-saml-realm.asciidoc

This file was deleted.

7 changes: 4 additions & 3 deletions x-pack/docs/en/security/authentication/saml-guide.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ SAML authentication is enabled by configuring a SAML realm within the
authentication chain for {es}.

This realm has a few mandatory settings, and a number of optional settings.
The available settings are described in detail in the
<<saml-settings, SAML realm documentation>>, this guide will walk you through
the most common settings.
The available settings are described in detail in <<security-settings>>. For
example, <<ref-saml-settings>>, <<ref-saml-signing-settings>>,
<<ref-saml-encryption-settings>>, <<ref-saml-ssl-settings>>.
This guide will walk you through the most common settings.

Create a realm by adding the following to your `elasticsearch.yml`
configuration file. Each configuration value is explained below.
Expand Down
21 changes: 0 additions & 21 deletions x-pack/docs/en/security/authentication/saml-realm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,3 @@ chain.
In order to simplify the process of configuring SAML authentication within the
Elastic Stack, there is a step-by-step guide to
<<saml-guide, Configuring Elasticsearch and Kibana to use SAML single sign-on>>.

The remainder of this document will describe {es} specific configuration options
for SAML realms.

[[saml-settings]]
==== SAML realm settings

See {ref}/security-settings.html#ref-saml-settings[SAML realm settings].

==== SAML realm signing settings

See {ref}/security-settings.html#ref-saml-signing-settings[SAML realm signing settings].

==== SAML realm encryption settings

See {ref}/security-settings.html#ref-saml-encryption-settings[SAML realm encryption settings].

==== SAML realm SSL settings

See {ref}/security-settings.html#ref-saml-ssl-settings[SAML realm SSL settings].

4 changes: 1 addition & 3 deletions x-pack/docs/en/security/configuring-es.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ your subscription. For more information, see https://www.elastic.co/subscription
** <<configuring-ldap-realm,LDAP realms>>
** <<native-realm,Native realms>>
** <<configuring-pki-realm,PKI realms>>
** <<configuring-saml-realm,SAML realms>>
** <<saml-realm,SAML realms>>

. Set up roles and users to control access to {es}.
+
Expand Down Expand Up @@ -149,8 +149,6 @@ include::authentication/configuring-active-directory-realm.asciidoc[]
include::authentication/configuring-file-realm.asciidoc[]
include::authentication/configuring-ldap-realm.asciidoc[]
include::authentication/configuring-pki-realm.asciidoc[]
include::authentication/configuring-saml-realm.asciidoc[]

include::authentication/configuring-kerberos-realm.asciidoc[]

include::reference/files.asciidoc[]
Expand Down

0 comments on commit 48f53ef

Please sign in to comment.