RHIDP-1925 Fix GitHub integration procedure

assemblies/assembly-authenticating-with-github.adoc

@@ -1,5 +1,5 @@
-[id="assembly-auth-provider-github"]
-= Enabling the GitHub authentication provider
+[id="authenticating-with-github"]
+= Authenticating with GitHub
 
 To authenticate users with GitHub or GitHub Enterprise:
 

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

@@ -159,6 +159,27 @@ auth:
         enterpriseInstanceUrl: ${GITHUB_HOST_DOMAIN}
 ----
 
+[TIP]
+====
+To enable GitHub integration with another authentication provider you have already configured, omit the `auth` and `signInPage` sections from this procedure:
+
+.`app-config-rhdh.yaml` fragment with mandatory fields to enable integration with GitHub and use a different authentication provider
+[source,yaml]
+----
+integrations:
+  github:
+    - host: ${GITHUB_HOST_DOMAIN}
+      apps:
+        - appId: ${AUTH_GITHUB_APP_ID}
+          clientId: ${AUTH_GITHUB_CLIENT_ID}
+          clientSecret: ${GITHUB_CLIENT_SECRET}
+          webhookUrl: ${GITHUB_WEBHOOK_URL}
+          webhookSecret: ${GITHUB_WEBHOOK_SECRET}
+          privateKey: |
+            ${GITHUB_PRIVATE_KEY_FILE}
+----
+====
+
 --
 
 .Verification

modules/importing-repositories/procedure-enabling-the-bulk-import-from-github-feature.adoc

@@ -3,7 +3,7 @@
 You can enable the Bulk Import feature for users and give them the necessary permissions to access it.
 
 .Prerequisites
-* You have link:{authentication-book-url}#enabling-authentication-with-github[configured GitHub authentication and integration].
+* You have link:{authentication-book-url}#enabling-authentication-with-github[configured GitHub integration].
 
 .Procedure
 

modules/importing-repositories/procedure-importing-multiple-repositories-from-github.adoc

@@ -4,7 +4,6 @@
 In {product}, you can select your GitHub repositories and automate their onboarding to the {product-short} catalog.
 
 .Prerequisites
-* You have link:{authentication-book-url}#enabling-authentication-with-github[configured GitHub authentication and integration].
 * You have xref:enabling-and-giving-access-to-the-bulk-import-feature[enabled the Bulk Import feature and gave access to it].
 
 .Procedure