From 20dfd343115363c3476b02540472e09b1b1e8fcf Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Sun, 25 Feb 2024 03:29:41 -0800 Subject: [PATCH 1/2] docs: add gitlab self-managed example Add missing example for configuring gitlab self hosted --- docs/admin/external-auth.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/admin/external-auth.md b/docs/admin/external-auth.md index 4c1b205c1fe79..a511551a9c2fe 100644 --- a/docs/admin/external-auth.md +++ b/docs/admin/external-auth.md @@ -108,6 +108,21 @@ CODER_EXTERNAL_AUTH_0_AUTH_URL="https://app.vssps.visualstudio.com/oauth2/author CODER_EXTERNAL_AUTH_0_TOKEN_URL="https://app.vssps.visualstudio.com/oauth2/token" ``` +### GitLab self-managed + +GitLab self-managed requires the following environment variables: + +```env +CODER_EXTERNAL_AUTH_0_ID="primary-gitlab" +CODER_EXTERNAL_AUTH_0_TYPE=gitlab +CODER_EXTERNAL_AUTH_0_CLIENT_ID=xxxxxx +CODER_EXTERNAL_AUTH_0_CLIENT_SECRET=xxxxxxx +CODER_EXTERNAL_AUTH_0_VALIDATE_URL="https://gitlab.company.org/oauth/token/info" +CODER_EXTERNAL_AUTH_0_AUTH_URL="https://gitlab.company.org/oauth/authorize" +CODER_EXTERNAL_AUTH_0_TOKEN_URL="https://gitlab.company.org/oauth/token" +CODER_EXTERNAL_AUTH_0_REGEX=gitlab\.company\.org +``` + ### Self-managed git providers Custom authentication and token URLs should be used for self-managed Git From 15ea4cd03de34cbb905271c59d161e7b5b3e2c7d Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Sun, 25 Feb 2024 03:39:30 -0800 Subject: [PATCH 2/2] docs: clarify what the client_id refers to --- docs/admin/external-auth.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/admin/external-auth.md b/docs/admin/external-auth.md index a511551a9c2fe..cab2cc0a5a3ce 100644 --- a/docs/admin/external-auth.md +++ b/docs/admin/external-auth.md @@ -115,6 +115,7 @@ GitLab self-managed requires the following environment variables: ```env CODER_EXTERNAL_AUTH_0_ID="primary-gitlab" CODER_EXTERNAL_AUTH_0_TYPE=gitlab +# This value is the "Application ID" CODER_EXTERNAL_AUTH_0_CLIENT_ID=xxxxxx CODER_EXTERNAL_AUTH_0_CLIENT_SECRET=xxxxxxx CODER_EXTERNAL_AUTH_0_VALIDATE_URL="https://gitlab.company.org/oauth/token/info"