From b71a97a149bf8628e92c798fb663ec782e661c22 Mon Sep 17 00:00:00 2001 From: Tim Quinlan Date: Thu, 10 Aug 2023 12:53:58 -0400 Subject: [PATCH 1/2] updated helm values.yaml code snippet, put quote around boolean values and added comments showing that CODER_OAUTH2_GITHUB_ALLOW_EVERYONE and CODER_OAUTH2_GITHUB_ALLOW_EVERYONE are mutually exclusive --- docs/admin/auth.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/admin/auth.md b/docs/admin/auth.md index 794def7f67e9e..752c00735314e 100644 --- a/docs/admin/auth.md +++ b/docs/admin/auth.md @@ -59,15 +59,17 @@ If deploying Coder via Helm, you can set the above environment variables in the coder: env: - name: CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS - value: true - - name: CODER_OAUTH2_GITHUB_ALLOWED_ORGS - value: "your-org" + value: "true" - name: CODER_OAUTH2_GITHUB_CLIENT_ID value: "533...des" - name: CODER_OAUTH2_GITHUB_CLIENT_SECRET value: "G0CSP...7qSM" - - name: CODER_OAUTH2_GITHUB_ALLOW_EVERYONE - value: true + # If setting allowd orgs, comment out CODER_OAUTH2_GITHUB_ALLOW_EVERYONE and its value + - name: CODER_OAUTH2_GITHUB_ALLOWED_ORGS + value: "your-org" + # If allowing everyone, comment out CODER_OAUTH2_GITHUB_ALLOWED_ORGS and it's value + #- name: CODER_OAUTH2_GITHUB_ALLOW_EVERYONE + # value: "true" ``` To upgrade Coder, run: From 9cd460cd182b1a4286d11d6e1c71a4f73adfe4f4 Mon Sep 17 00:00:00 2001 From: timquinlan Date: Thu, 10 Aug 2023 13:54:54 -0400 Subject: [PATCH 2/2] Update auth.md spotted and fixed minor typo --- docs/admin/auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/auth.md b/docs/admin/auth.md index 752c00735314e..5d7b135f12a46 100644 --- a/docs/admin/auth.md +++ b/docs/admin/auth.md @@ -64,7 +64,7 @@ coder: value: "533...des" - name: CODER_OAUTH2_GITHUB_CLIENT_SECRET value: "G0CSP...7qSM" - # If setting allowd orgs, comment out CODER_OAUTH2_GITHUB_ALLOW_EVERYONE and its value + # If setting allowed orgs, comment out CODER_OAUTH2_GITHUB_ALLOW_EVERYONE and its value - name: CODER_OAUTH2_GITHUB_ALLOWED_ORGS value: "your-org" # If allowing everyone, comment out CODER_OAUTH2_GITHUB_ALLOWED_ORGS and it's value