From b18f4977ba23b4dc132af04aa39a1c795800a81f Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Mon, 9 Jul 2018 19:02:58 -0700 Subject: [PATCH] fixing auth ordering/links --- .../authentication/_index.md | 9 +++---- .../authentication/active-directory/_index.md | 6 ++--- .../authentication/azure-ad/_index.md | 24 +++++++++---------- .../authentication/freeipa/_index.md | 6 ++--- .../authentication/github/_index.md | 6 ++--- .../local-authentication/_index.md | 6 ++--- .../authentication/openLDAP/_index.md | 6 ++--- 7 files changed, 32 insertions(+), 31 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/_index.md index cef5b6b381e..a683f88f053 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/_index.md @@ -17,13 +17,14 @@ You have multiple options for user authentication in Rancher: Open source projects or organizations that use GitHub for source control may prefer that users sign in using their GitHub accounts. -- [FreeIPA](./freeipa/) +- [OpenLDAP](./openlap/) + + Organizations can use OpenLDAP for authentication, allowing users to sign in using their corporate credentials. + +- [FreeIPA](./freeipa/) Organizations can use FreeIPA for authentication, allowing users to sign in using their corporate credentials. -- [OpenLDAP](./openlap/) - - Organizations can use OpenLDAP for authentication, allowing users to sign in using their corporate credentials. - [Local Authentication](./local-authentication/) diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/active-directory/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/active-directory/_index.md index 989cb067d98..3cada243ea6 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/active-directory/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/active-directory/_index.md @@ -1,6 +1,6 @@ --- -title: Configuring Active Directory Authentication -weight: 3075 +title: Configuring Active Directory (AD) +weight: 51 --- In environments using Microsoft Active Directory (AD), you can configure Rancher to allow sign on using AD credentials. @@ -20,7 +20,7 @@ In environments using Microsoft Active Directory (AD), you can configure Rancher 4. Complete the **Configure an Active Directory server** form. You may need to log in to your domain controller to find the information requested in the form. - + >**Using TLS?** >Make sure you have an LDAP certificate installed.
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/azure-ad/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/azure-ad/_index.md index ec2047f5b5e..5f78de50333 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/azure-ad/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/azure-ad/_index.md @@ -1,6 +1,6 @@ --- -title: Configuring Azure Active Directory -weight: 3075 +title: Configuring Azure Active Directory (Azure AD) +weight: 52 --- If you have an instance of Active Directory (AD) hosted in Azure, you can configure Rancher to allow your users to log in using their AD accounts. Configuration of Azure AD external authentication requires you to make configurations in both Azure and Rancher. @@ -15,7 +15,7 @@ Configuring Rancher to allow your users to authenticate with their Azure AD acco ->**Tip:** Before you start, we recommend creating an empty text file. You can use this file to copy values from Azure that you'll paste into Rancher later. +>**Tip:** Before you start, we recommend creating an empty text file. You can use this file to copy values from Azure that you'll paste into Rancher later. 1. [Register Rancher with Azure](#1-register-rancher-with-azure) @@ -56,7 +56,7 @@ Before enabling Azure AD within Rancher, you must register Rancher with Azure. 1. From **Application type**, make sure that **Web app / API** is selected. 1. In the **Sign-on URL** field, enter the URL of your Rancher Server. - + 1. Click **Create**. ### 2. Create an Azure API Key @@ -124,29 +124,29 @@ As your final step in Azure, copy the data that you'll use to configure Rancher 1. Use search to open the **Azure Active Directory** service. ![Open Azure Active Directory]({{< baseurl >}}/img/rancher/search-azure-ad.png) - + 1. From the **Azure Active Directory** menu, open **Properties**. - + 2. Copy the **Directory ID** and paste it into your [text file](#tip). - + You'll paste this value into Rancher as your **Tenant ID**. 1. Obtain your Rancher **Application ID**. - + 1. Use search to open **App registrations**. ![Open App Registrations]({{< baseurl >}}/img/rancher/search-app-registrations.png) - + 1. Find the entry you created for Rancher. - + 1. Copy the **Application ID** and paste it to your [text file](#tip). 1. Obtain your Rancher **Graph Endpoint**, **Token Endpoint**, and **Auth Endpoint**. - + 1. From **App registrations**, click **Endpoints**. ![Click Endpoints]({{< baseurl >}}/img/rancher/click-endpoints.png) - + 2. Copy the following endpoints to your clipboard and paste them into your [text file](#tip) (these values will be your Rancher endpoint values). - **Microsoft Azure AD Graph API Endpoint** (Graph Endpoint) diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/freeipa/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/freeipa/_index.md index 51e72d3aad5..844242110a6 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/freeipa/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/freeipa/_index.md @@ -1,6 +1,6 @@ --- title: Configuring FreeIPA -weight: 5000 +weight: 55 --- If your organization uses FreeIPA for user authentication, you can configure Rancher to allow your users to login using their FreeIPA credentials. @@ -20,7 +20,7 @@ If your organization uses FreeIPA for user authentication, you can configure Ran 4. Complete the **Configure an FreeIPA server** form. You may need to log in to your domain controller to find the information requested in the form. - + >**Using TLS?** >Make sure you have an LDAP certificate installed.
@@ -52,4 +52,4 @@ If your organization uses FreeIPA for user authentication, you can configure Ran **Result:** - FreeIPA authentication is configured. -- You are signed into Rancher with your FreeIPA account (i.e., the _external principal_). \ No newline at end of file +- You are signed into Rancher with your FreeIPA account (i.e., the _external principal_). diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md index 9e7876bd3e4..603bb20847f 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md @@ -1,6 +1,6 @@ --- -title: Configuring GitHub Authentication -weight: 3075 +title: Configuring GitHub +weight: 53 --- In environments using GitHub, you can configure Rancher to allow sign on using GitHub credentials. @@ -48,4 +48,4 @@ In environments using GitHub, you can configure Rancher to allow sign on using G **Result:** - GitHub authentication is configured. -- You are signed into Rancher with your GitHub account (i.e., the _external principal_). \ No newline at end of file +- You are signed into Rancher with your GitHub account (i.e., the _external principal_). diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/local-authentication/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/local-authentication/_index.md index 2356fdf5785..189371f7084 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/local-authentication/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/local-authentication/_index.md @@ -1,10 +1,10 @@ --- title: Configuring Local Authentication -weight: 3075 +weight: 56 --- -Regardless of whether you use external authentication, you should create a few local authentication users so that you can continue using Rancher if you your external authentication service encounters issues. +Regardless of whether you use external authentication, you should create a few local authentication users so that you can continue using Rancher if you your external authentication service encounters issues. 1. From the **Global** view, select **Users** from the main menu. -2. Click **Add User**. Then complete the **Add User** form. Click **Create** when you're done. \ No newline at end of file +2. Click **Add User**. Then complete the **Add User** form. Click **Create** when you're done. diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/openLDAP/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/openLDAP/_index.md index eaad856c84e..56724437e2f 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/openLDAP/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/openLDAP/_index.md @@ -1,6 +1,6 @@ --- title: Configuring OpenLDAP -weight: 5000 +weight: 54 --- If your organization uses OpenLDAP for user authentication, you can configure Rancher to allow your users to login using their OpenLDAP credentials. @@ -20,7 +20,7 @@ If your organization uses OpenLDAP for user authentication, you can configure Ra 4. Complete the **Configure an OpenLDAP server** form. You may need to log in to your domain controller to find the information requested in the form. - + >**Using TLS?** >Make sure you have an LDAP certificate installed.
@@ -52,4 +52,4 @@ If your organization uses OpenLDAP for user authentication, you can configure Ra **Result:** - OpenLDAP authentication is configured. -- You are signed into Rancher with your OpenLDAP account (i.e., the _external principal_). \ No newline at end of file +- You are signed into Rancher with your OpenLDAP account (i.e., the _external principal_).