From 836e15afbc2ab82a2ddda6a0acb8a59e32c8d082 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 1 Apr 2020 11:09:26 -0600 Subject: [PATCH] docs: Minor tweaks, clarifications. --- src/docs/markdown/architecture.md | 2 +- src/docs/markdown/caddyfile/concepts.md | 4 ++++ src/docs/markdown/caddyfile/directives/reverse_proxy.md | 3 ++- src/docs/markdown/config-adapters.md | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/docs/markdown/architecture.md b/src/docs/markdown/architecture.md index a136003..7cfc316 100644 --- a/src/docs/markdown/architecture.md +++ b/src/docs/markdown/architecture.md @@ -135,7 +135,7 @@ You can [watch a video about the design of Caddy 2 here](https://www.youtube.com A config reload works by provisioning the new modules, and if all succeed, the old ones are cleaned up. For a brief period, two configs are operational at the same time. -Each configuration is associated with a [context](https://pkg.go.dev/github.com/caddyserver/caddy/v2?tab=doc#Context) which holds all the module state, so most state escapes the scope of a config. This is good news for correctness, performance, and simplicity! +Each configuration is associated with a [context](https://pkg.go.dev/github.com/caddyserver/caddy/v2?tab=doc#Context) which holds all the module state, so most state never escapes the scope of a config. This is good news for correctness, performance, and simplicity! However, sometimes truly global state is necessary. For example, the reverse proxy may keep track of the health of its upstreams; since there is only one of each upstream globally, it would be bad if it forgot about them every time a minor config change was made. Fortunately, Caddy [provides facilities](https://pkg.go.dev/github.com/caddyserver/caddy/v2?tab=doc#UsagePool) similar to a language runtime's garbage collector to keep global state tidy. diff --git a/src/docs/markdown/caddyfile/concepts.md b/src/docs/markdown/caddyfile/concepts.md index 28f39f1..f820ebf 100644 --- a/src/docs/markdown/caddyfile/concepts.md +++ b/src/docs/markdown/caddyfile/concepts.md @@ -154,6 +154,8 @@ These are examples of valid addresses: - `127.0.0.1` - `[::1]:2015` - `example.com/foo/*` +- `*.example.com` +- `http://`