From 37e3ea88adaa87d644d9a7a85955ecfdfe712efd Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Tue, 30 May 2023 05:56:17 +0000 Subject: [PATCH 1/2] Fix wildcard dns docs Signed-off-by: Spike Curtis --- docs/admin/configure.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/admin/configure.md b/docs/admin/configure.md index 1b98cca383b97..9d31f6dfd9611 100644 --- a/docs/admin/configure.md +++ b/docs/admin/configure.md @@ -38,8 +38,13 @@ coder server via the dashboard or running [coder_apps](../templates/README.md#coder-apps) on an absolute path. Set this to a wildcard subdomain that resolves to Coder (e.g. `*.coder.example.com`). -> If you are providing TLS certificates directly to the Coder server, you must use a single certificate for the -> root and wildcard domains. Multi-certificate support [is planned](https://github.com/coder/coder/pull/4150). +If you are providing TLS certificates directly to the Coder server, either + +1. use a single certificate/key for the root and wildcard domains. +2. configure both root and wildcard domain certificates/keys via + [`coder.tls.secretNames`](https://github.com/coder/coder/blob/main/helm/values.yaml) in the Helm Chart, or + [`--tls-key-file`](../cli/server#--tls-cert-file) and [`--tls-key-file`](../cli/server#--tls-key-file) command + line options. ## TLS & Reverse Proxy From 4dd1e4cf904de4beea1a584945eec14144278380 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Tue, 30 May 2023 12:03:37 +0000 Subject: [PATCH 2/2] Clarify Signed-off-by: Spike Curtis --- docs/admin/configure.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/admin/configure.md b/docs/admin/configure.md index 9d31f6dfd9611..6b3aa12c8864f 100644 --- a/docs/admin/configure.md +++ b/docs/admin/configure.md @@ -40,11 +40,12 @@ subdomain that resolves to Coder (e.g. `*.coder.example.com`). If you are providing TLS certificates directly to the Coder server, either -1. use a single certificate/key for the root and wildcard domains. -2. configure both root and wildcard domain certificates/keys via +1. Use a single certificate and key for both the root and wildcard domains. +2. Configure multiple certificates and keys via [`coder.tls.secretNames`](https://github.com/coder/coder/blob/main/helm/values.yaml) in the Helm Chart, or - [`--tls-key-file`](../cli/server#--tls-cert-file) and [`--tls-key-file`](../cli/server#--tls-key-file) command - line options. + [`--tls-cert-file`](../cli/server#--tls-cert-file) and [`--tls-key-file`](../cli/server#--tls-key-file) command + line options (these both take a comma separated list of files; list certificates and their respective keys in the + same order). ## TLS & Reverse Proxy