Skip to content

Commit c429966

Browse files
committed
docs: General 2.6 updates
1 parent a87295b commit c429966

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/docs/markdown/caddyfile/directives.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ vars
115115
root
116116
117117
header
118+
copy_response_headers # only in reverse_proxy's handle_response block
118119
request_body
119120
120121
redir
@@ -141,6 +142,7 @@ route
141142
# handlers that typically respond to requests
142143
abort
143144
error
145+
copy_response # only in reverse_proxy's handle_response block
144146
respond
145147
metrics
146148
reverse_proxy

src/docs/markdown/caddyfile/matchers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,12 +533,12 @@ path_regexp static \.([a-f0-9]{6})\.(css|js)$
533533
### protocol
534534

535535
```caddy-d
536-
protocol http|https|grpc
536+
protocol http|https|grpc|http/<version>[+]
537537
538538
expression protocol('http|https|grpc')
539539
```
540540

541-
By request protocol.
541+
By request protocol. A broad protocol name such as `http`, `https`, or `grpc` can be used; or specific or minimum HTTP versions such as `http/1.1` or `http/2+`.
542542

543543
There can only be one `protocol` matcher per named matcher.
544544

src/docs/markdown/command-line.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ Prints the environment as seen by caddy, then exits. Can be useful when debuggin
180180
[--domain &lt;example.com&gt;]
181181
[--browse]
182182
[--templates]
183-
[--access-log]</code></pre>
183+
[--access-log]
184+
[--debug]</code></pre>
184185

185186
Spins up a simple but production-ready static file server.
186187

@@ -196,6 +197,8 @@ Spins up a simple but production-ready static file server.
196197

197198
`--access-log` enables the request/access log.
198199

200+
`--debug` enables verbose logging.
201+
199202
This command disables the admin API, making it easier to run multiple instances on a local development machine.
200203

201204

@@ -373,7 +376,8 @@ Pipe in a maintenance page:
373376
[--from &lt;addr&gt;]
374377
--to &lt;addr&gt;
375378
[--change-host-header]
376-
[--internal-certs]</code></pre>
379+
[--internal-certs]
380+
[--debug]</code></pre>
377381

378382
Spins up a simple but production-ready HTTP(S) reverse proxy.
379383

@@ -385,6 +389,8 @@ Spins up a simple but production-ready HTTP(S) reverse proxy.
385389

386390
`--internal-certs` will cause Caddy to issue certificates using its internal issuer (effectively self-signed) for the domain specified in the `--from` address.
387391

392+
`--debug` enables verbose logging.
393+
388394
Both `--from` and `--to` parameters can be URLs, as scheme and domain name will be inferred from the provided URL (paths and query strings ignored). Or they can be a simple network address and not a complete URL.
389395

390396
This command disables the admin API so it is easier to run multiple instances on a local development machine.

src/docs/markdown/extending-caddy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ To emit logs, get a logger in your module's Provision method:
184184

185185
```go
186186
func (g *Gizmo) Provision(ctx caddy.Context) error {
187-
g.logger = ctx.Logger(g) // g.logger is a *zap.Logger
187+
g.logger = ctx.Logger() // g.logger is a *zap.Logger
188188
}
189189
```
190190

0 commit comments

Comments
 (0)