From bab321bc512a257e5f4ba8a24c3ace3ba226314d Mon Sep 17 00:00:00 2001 From: Mark Milligan Date: Sat, 17 Dec 2022 14:15:24 +0000 Subject: [PATCH 1/2] docs: add contact us form for sales; improve enterprise page --- docs/admin/upgrade.md | 3 ++- docs/enterprise.md | 38 ++++++++++++++++++-------------------- docs/networking.md | 3 ++- docs/templates.md | 9 +++++++++ 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/docs/admin/upgrade.md b/docs/admin/upgrade.md index 4002b94337113..d3a083b4f90fc 100644 --- a/docs/admin/upgrade.md +++ b/docs/admin/upgrade.md @@ -22,10 +22,11 @@ curl -L https://coder.com/install.sh | sh ``` The script will unpack the new `coder` binary version over the one currently installed. -Next, you can restart Coder with the following command (if running it as a system +Next, you can restart Coder with the following commands (if running it as a system service): ```console +systemctl daemon-reload systemctl restart coder ``` diff --git a/docs/enterprise.md b/docs/enterprise.md index 95a46af2c3729..bd7d46fb5705a 100644 --- a/docs/enterprise.md +++ b/docs/enterprise.md @@ -1,35 +1,33 @@ # Enterprise Features Coder is free to use and includes some features that are only accessible with a paid license. -Contact sales@coder.com to obtain a license. +[Contact Sales](https://coder.com/contact) for pricing or [get a free +trial](https://coder.com/trial). -### User Management -- [Groups](./admin/groups.md) -- [Template RBAC](./admin/rbac.md) -- [SCIM](./admin/auth.md#scim) +| Category | Feature | Open Source | Enterprise | +| -------- | ------- | :-----------: | :----------: | +| User Management | [Groups](./admin/groups.md) | | X | +| User Management | [OIDC](./admin/auth.md) | X* | X | +| User Management | [SCIM](./admin/auth.md#scim) | | X | +| Governance | [Audit Logging](./admin/audit-logs.md) | | X | +| Governance | [Browser Only Connections](./networking.md#browser-only-connections) | | X | +| Governance | [Template Access Control](./admin/rbac.md) | | X | +| Cost Control | [Quotas](./admin/quotas.md) | | X | +| Cost Control | [Max Workspace Auto-Stop](./templates.md#configure-max-workspace-auto-stop) | | X | +| Deployment | [High Availability](./admin/high-availability.md) | | X | +| Deployment | [Service Banners](./admin/service-banners.md) | | X | +| Deployment | [Git Provider Integration](./admin/git-providers.md) | X* | X | +| Deployment | Isolated Terraform Runners | | X | -### Networking & Deployment +* Free for up to 20 users -- [High Availability](./admin/high-availability.md) -- [Browser Only Connections](./networking.md#browser-only-connections) -- [Service Banners](./admin/service-banners.md) - -### Other - -- [Audit Logging](./admin/audit-logs.md) -- [Quotas](./admin/quotas.md) - -### Coming soon - -- Multiple Git Provider Authentication -- Max Workspace Auto-Stop ## Adding your license key ### Requirements -- Your license key (contact sales@coder.com if you don't have yours) +- Your license key - Coder CLI installed ### Instructions diff --git a/docs/networking.md b/docs/networking.md index 679d3b6d36341..43d376121cff7 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -86,7 +86,8 @@ $ coder server --derp-config-path derpmap.json The dashboard (and web apps opened through the dashboard) are served from the coder server, so they can only be geo-distributed with High Availability mode in -our Enterprise Edition. [Reach out to sales](mailto:sales@coder.com) to learn more. +our Enterprise Edition. [Reach out to Sales](https://coder.com/contact) to learn +more. ## Browser-only connections (enterprise) diff --git a/docs/templates.md b/docs/templates.md index dd46fadeae039..5e7d9cafa26f3 100644 --- a/docs/templates.md +++ b/docs/templates.md @@ -70,6 +70,15 @@ coder templates create > [examples/](https://github.com/coder/coder/tree/main/examples/templates) > directory in the repo. +## Configure Max Workspace Auto-Stop + +To control cost, specify a maximum time to live flag for a template in hours or +minutes. + +```sh +coder templates create my-template --ttl 4h +``` + ## Customize templates Example templates are not designed to support every use (e.g From 6ae9b09c098b340d5c374a7695ed313f84bc7830 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Tue, 20 Dec 2022 12:53:52 +0000 Subject: [PATCH 2/2] make fmt --- docs/enterprise.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/docs/enterprise.md b/docs/enterprise.md index bd7d46fb5705a..e20ba2f6f999b 100644 --- a/docs/enterprise.md +++ b/docs/enterprise.md @@ -4,24 +4,22 @@ Coder is free to use and includes some features that are only accessible with a [Contact Sales](https://coder.com/contact) for pricing or [get a free trial](https://coder.com/trial). - -| Category | Feature | Open Source | Enterprise | -| -------- | ------- | :-----------: | :----------: | -| User Management | [Groups](./admin/groups.md) | | X | -| User Management | [OIDC](./admin/auth.md) | X* | X | -| User Management | [SCIM](./admin/auth.md#scim) | | X | -| Governance | [Audit Logging](./admin/audit-logs.md) | | X | -| Governance | [Browser Only Connections](./networking.md#browser-only-connections) | | X | -| Governance | [Template Access Control](./admin/rbac.md) | | X | -| Cost Control | [Quotas](./admin/quotas.md) | | X | -| Cost Control | [Max Workspace Auto-Stop](./templates.md#configure-max-workspace-auto-stop) | | X | -| Deployment | [High Availability](./admin/high-availability.md) | | X | -| Deployment | [Service Banners](./admin/service-banners.md) | | X | -| Deployment | [Git Provider Integration](./admin/git-providers.md) | X* | X | -| Deployment | Isolated Terraform Runners | | X | - -* Free for up to 20 users - +| Category | Feature | Open Source | Enterprise | +| --------------- | --------------------------------------------------------------------------- | :------------: | :--------: | +| User Management | [Groups](./admin/groups.md) | | X | +| User Management | [OIDC](./admin/auth.md) | X\* | X | +| User Management | [SCIM](./admin/auth.md#scim) | | X | +| Governance | [Audit Logging](./admin/audit-logs.md) | | X | +| Governance | [Browser Only Connections](./networking.md#browser-only-connections) | | X | +| Governance | [Template Access Control](./admin/rbac.md) | | X | +| Cost Control | [Quotas](./admin/quotas.md) | | X | +| Cost Control | [Max Workspace Auto-Stop](./templates.md#configure-max-workspace-auto-stop) | | X | +| Deployment | [High Availability](./admin/high-availability.md) | | X | +| Deployment | [Service Banners](./admin/service-banners.md) | | X | +| Deployment | [Git Provider Integration](./admin/git-providers.md) | X\* | X | +| Deployment | Isolated Terraform Runners | | X | + +\* Free for up to 20 users ## Adding your license key