mirrors/caddy-website
1
0
Fork 0
mirror of https://github.com/caddyserver/website.git synced 2025-04-24 05:56:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v2.1'

Browse source
This commit is contained in:
Matthew Holt 2020-06-08 12:31:36 -06:00
commit 148176582d
7 changed files with 77 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/docs/markdown/conventions.md
View file

@ -141,7 +141,7 @@ It is crucial that this directory is persistent and writeable by Caddy.
## Durations
Duration strings are commonly used throughout Caddy's configuration. They take on the same format as [Go's time.ParseDuration syntax](https://golang.org/pkg/time/#ParseDuration). Valid units are:
Duration strings are commonly used throughout Caddy's configuration. They take on the same format as [Go's time.ParseDuration syntax](https://golang.org/pkg/time/#ParseDuration) except you can also use `d` for day (we assume 1 day = 24 hours for simplicity). Valid units are:
- `ns` (nanosecond)
- `us`/`µs` (microsecond)
@ -149,6 +149,7 @@ Duration strings are commonly used throughout Caddy's configuration. They take o
- `s` (second)
- `m` (minute)
- `h` (hour)
- `d` (day)
Examples:
@ -156,5 +157,6 @@ Examples:
- `5s`
- `1.5h`
- `2h45m`
- `90d`
In the [JSON config](/docs/json/), duration values can also be integers which represent nanoseconds.