diff --git a/website/docs/3-concepts/2-ingress/2-publishing-services.md b/website/docs/3-concepts/2-ingress/2-publishing-services.md index 618a14fa..1acbb7c8 100644 --- a/website/docs/3-concepts/2-ingress/2-publishing-services.md +++ b/website/docs/3-concepts/2-ingress/2-publishing-services.md @@ -132,8 +132,8 @@ Use it when you need: - Advanced TLS settings. - Other Caddy features and plugins. -See [Deploying or updating Caddy](3-managing-caddy.md#deploying-or-updating-caddy) for details on deploying Caddy with a -custom global configuration. +See [Custom global configuration](3-managing-caddy.md#custom-global-configuration) to learn how to deploy Caddy +with a custom global config. ### Templates @@ -278,7 +278,7 @@ example.com { The generated config combines: - Global Caddy configuration (`x-caddy` from the `caddy` service). - See [Deploying or updating Caddy](3-managing-caddy.md#deploying-or-updating-caddy) for details. + See [Custom global configuration](3-managing-caddy.md#custom-global-configuration) for details. - Auto-generated configs from published service ports (`x-ports`). - Custom Caddy configs from services (`x-caddy`). - Skipped invalid configs with error messages as comments. diff --git a/website/docs/3-concepts/2-ingress/3-managing-caddy.md b/website/docs/3-concepts/2-ingress/3-managing-caddy.md index 9ab6f586..6b09d193 100644 --- a/website/docs/3-concepts/2-ingress/3-managing-caddy.md +++ b/website/docs/3-concepts/2-ingress/3-managing-caddy.md @@ -30,6 +30,8 @@ uc inspect caddy Service ID: b5b269d5dc5ed4fdae6542894f94de82 Name: caddy Mode: global +Labels: + uncloud.caddy.managed= CONTAINER ID IMAGE CREATED STATUS IP ADDRESS MACHINE fb8f390e634d ghcr.io/unlabs-dev/caddy-uncloud:0.1.4 3 weeks ago Up 3 weeks 10.210.1.2 prod-ap1 @@ -132,7 +134,7 @@ storage. It must also include `curl` for the health check and start Caddy with ` The default Uncloud Caddy image [`ghcr.io/unlabs-dev/caddy-uncloud`](https://github.com/unlabs-dev/caddy-uncloud/pkgs/container/caddy-uncloud) satisfies -these requirements. See the [release notest](https://github.com/unlabs-dev/caddy-uncloud/releases/latest) for the Caddy +these requirements. See the [release notes](https://github.com/unlabs-dev/caddy-uncloud/releases/latest) for the Caddy version and the list of included modules. If you need other Caddy modules or want to choose a compatible Caddy version, you can diff --git a/website/docs/3-concepts/2-ingress/4-cluster-storage-for-caddy.md b/website/docs/3-concepts/2-ingress/4-cluster-storage-for-caddy.md index a98a3167..3a29140b 100644 --- a/website/docs/3-concepts/2-ingress/4-cluster-storage-for-caddy.md +++ b/website/docs/3-concepts/2-ingress/4-cluster-storage-for-caddy.md @@ -24,13 +24,19 @@ storage. Before you deploy, upgrade the [`uc` CLI](../../2-getting-started/1-install-cli.md) and the daemon on all machines to v0.22.0 or newer. Follow the [upgrade instructions](https://github.com/psviderski/uncloud/releases/latest) for daemon -upgrades, including any required migrations from older releases. Check current versions with `uc version` and `uc -machine ls`. +upgrades, including any required migrations from older releases. Check current versions with `uc version` and +`uc machine ls`. The first `uc caddy deploy` after the upgrade doesn't know the values you set with earlier versions of `uc`. It replaces -your image, global config, and machine list with the defaults unless you pass them as flags. +your image, global config, and machine list with the defaults unless you pass them as flags. If you deployed Caddy only +to some machines, add `--machine` with the same machines to every `uc caddy deploy` command below. -If you already use `storage uncloud`, your certificates stay where they are, so you only need to run `uc caddy deploy`. +If you already use `storage uncloud`, your certificates stay where they are. Run `uc caddy deploy` and pass the global +config you deployed it with, unless it only contains `storage uncloud`: + +```shell +uc caddy deploy --caddyfile global.Caddyfile +``` ### Quick upgrade @@ -96,7 +102,7 @@ Follow these steps to keep your existing certificates and avoid HTTPS failures: ### Upgrading a Compose deployment -If you manage Caddy with Compose, keep using `uc deploy` and update your Compose file to match +If you manage Caddy with Compose, keep using `uc deploy` and update your Compose file to match the [Compose example](3-managing-caddy.md#managing-caddy-with-compose). To keep your certificates, follow the [migration steps](#migrating-certificates) with these changes: