Skip to content

Commit 76fae45

Browse files
committed
RHDHBUGS-2067 - Grouped optional configurations in one example file
Signed-off-by: Fabrice Flore-Thébault <[email protected]>
1 parent 9cc0c39 commit 76fae45

File tree

28 files changed

+900
-1012
lines changed

28 files changed

+900
-1012
lines changed

assemblies/assembly-authenticating-with-rhbk.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
= Authenticating with {rhbk-brand-name} ({rhbk})
55

66

7-
include::modules/authentication/proc-enabling-user-authentication-with-rhbk.adoc[leveloffset=+1]
7+
include::modules/authentication/proc-enabling-user-authentication-with-rhbk-with-optional-steps.adoc[leveloffset=+1]
88

99

1010
include::modules/authentication/proc-creating-a-custom-transformer-to-provision-users-from-rhbk-to-the-software-catalog.adoc[leveloffset=+1]

assemblies/assembly-enabling-authentication-with-github.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[id='enabling-authentication-with-github']
55
= Enabling authentication with GitHub
66

7-
include::modules/authentication/proc-enabling-user-authentication-with-github.adoc[leveloffset=+1]
7+
include::modules/authentication/proc-enabling-user-authentication-with-github-with-optional-steps.adoc[leveloffset=+1]
88

99

1010
include::modules/authentication/proc-enabling-user-authentication-with-github-as-an-auxiliary-authentication-provider.adoc[leveloffset=+1]

assemblies/assembly-enabling-authentication-with-mandatory-steps-only.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ include::modules/authentication/con-understanding-authentication-and-user-provis
1010
include::assembly-authenticating-with-the-guest-user.adoc[leveloffset=+1]
1111

1212

13-
include::modules/authentication/proc-enabling-user-authentication-with-rhbk.adoc[leveloffset=+1]
13+
include::modules/authentication/proc-enabling-user-authentication-with-rhbk-with-mandatory-steps.adoc[leveloffset=+1]
1414

1515

16-
include::modules/authentication/proc-enabling-user-authentication-with-github.adoc[leveloffset=+1]
16+
include::modules/authentication/proc-enabling-user-authentication-with-github-with-mandatory-steps.adoc[leveloffset=+1]
1717

1818

19-
include::modules/authentication/proc-enabling-user-authentication-with-microsoft-azure.adoc[leveloffset=+1]
19+
include::modules/authentication/proc-enabling-user-authentication-with-microsoft-azure-with-mandatory-steps.adoc[leveloffset=+1]
2020

assemblies/assembly-enabling-authentication.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ include::assembly-authenticating-with-rhbk.adoc[leveloffset=+1]
1616
include::assembly-enabling-authentication-with-github.adoc[leveloffset=+1]
1717

1818

19-
include::modules/authentication/proc-enabling-user-authentication-with-microsoft-azure.adoc[leveloffset=+1]
19+
include::modules/authentication/proc-enabling-user-authentication-with-microsoft-azure-with-optional-steps.adoc[leveloffset=+1]
2020

modules/authentication/proc-enabling-user-authentication-with-github-as-an-auxiliary-authentication-provider.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
[id="enabling-user-authentication-with-github-as-an-auxiliary-authentication-provider"]
44
= Enabling user authentication with GitHub as an auxiliary authentication provider
55

6-
To allow users to access GitHub templates or plugins that require GitHub authentication, configure GitHub as an auxiliary authentication provider. This method relies on a primary authentication provider for user identity management, and skips resolving user identity from this provider.
6+
To allow users to access GitHub templates or plugins that require GitHub authentication, configure GitHub as an auxiliary authentication provider.
7+
This method relies on a primary authentication provider for user identity management, and skips resolving user identity from this provider.
78

89
.Prerequisites
910
* You have {configuring-book-link}[added a custom {product-short} application configuration] with another authentication provider enabled, and have enough permissions to change it.
1011

11-
include::snip-enabling-user-authentication-with-github-common-steps.adoc[]
12+
include::snip-enabling-user-authentication-with-github-common-prerequisites.adoc[]
1213

14+
.Procedure
1315
. To set up the GitHub authentication provider as an auxiliary authentication provider, add the `auth.providers.github` section to your `{my-app-config-file}` file:
1416
+
1517
[source,yaml]
@@ -35,7 +37,6 @@ Enter `true`to skip user identity resolution for this provider to enable sign-in
3537
Do not enable this setting on the primary authentication provider you plan on using for sign-in and identity management.
3638

3739
.Verification
38-
3940
. Go to the {product-short} login page.
4041
. Log in with your primary authentication provider account.
4142
. In the top user menu, go to *Settings* > *Authentication Providers*.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_mod-docs-content-type: PROCEDURE
2+
3+
[id="enabling-user-authentication-with-github"]
4+
= Enabling user authentication with GitHub
5+
6+
Authenticate users with GitHub by provisioning the users and groups from GitHub to the {product-short} software catalog, and configuring the GitHub authentication provider in {product}.
7+
8+
.Prerequisites
9+
* You {configuring-book-link}[added a custom {product-short} application configuration], and have enough permissions to change it.
10+
include::snip-enabling-user-authentication-with-github-common-first-steps.adoc[]
11+
+
12+
Optional: Consider adding optional fields.
13+
See {configuring-book-link}[{configuring-book-title}].
14+
15+
include::snip-enabling-user-authentication-with-github-common-verification-steps.adoc[]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: PROCEDURE
2+
3+
[id="enabling-user-authentication-with-github"]
4+
= Enabling user authentication with GitHub
5+
6+
Authenticate users with GitHub by provisioning the users and groups from GitHub to the {product-short} software catalog, and configuring the GitHub authentication provider in {product}.
7+
8+
.Prerequisites
9+
* You {configuring-book-link}[added a custom {product-short} application configuration], and have enough permissions to change it.
10+
include::snip-enabling-user-authentication-with-github-common-prerequisites.adoc[]
11+
12+
include::snip-enabling-user-authentication-with-github-common-first-steps.adoc[]
13+
14+
. {empty}
15+
+
16+
--
17+
include::snip-enabling-user-authentication-with-github-optional-authentication-provider-steps.adoc[]
18+
--
19+
20+
include::snip-enabling-user-authentication-with-github-common-verification-steps.adoc[]

modules/authentication/proc-enabling-user-authentication-with-github.adoc

Lines changed: 0 additions & 158 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
:_mod-docs-content-type: PROCEDURE
2+
3+
[id="enabling-user-authentication-with-microsoft-azure"]
4+
= Enabling user authentication with {azure-brand-name}
5+
6+
include::snip-enabling-user-authentication-with-microsoft-azure-common-first-steps.adoc[]
7+
+
8+
Optional: Add optional fields.
9+
See {configuring-book-link}[{configuring-book-title}].
10+
11+
include::snip-enabling-user-authentication-with-microsoft-azure-common-authentication-provider-steps.adoc[]
12+
+
13+
Optional: Add optional fields.
14+
See {configuring-book-link}[{configuring-book-title}].
15+
16+
include::snip-enabling-user-authentication-with-microsoft-azure-common-verification-steps.adoc[]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
:_mod-docs-content-type: PROCEDURE
2+
3+
[id="enabling-user-authentication-with-microsoft-azure"]
4+
= Enabling user authentication with {azure-brand-name}
5+
6+
include::snip-enabling-user-authentication-with-microsoft-azure-common-first-steps.adoc[]
7+
8+
. {empty}
9+
+
10+
--
11+
include::snip-enabling-user-authentication-with-microsoft-azure-optional-catalog-provider-steps.adoc[]
12+
--
13+
14+
. {empty}
15+
+
16+
--
17+
include::snip-enabling-user-authentication-with-microsoft-azure-common-authentication-provider-steps.adoc[]
18+
--
19+
20+
. {empty}
21+
+
22+
--
23+
include::snip-enabling-user-authentication-with-microsoft-azure-optional-authentication-provider-steps.adoc[]
24+
--
25+
26+
include::snip-enabling-user-authentication-with-microsoft-azure-common-verification-steps.adoc[]

0 commit comments

Comments
 (0)