github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-06 04:34:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

httpcaddyfile: Add auto_https global option (#3284)

Browse Source
This commit is contained in:
Francis Lavoie
2020-05-19 18:59:51 -04:00
committed by GitHub
parent 9ee01dceac
commit fae064262d
4 changed files with 103 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
caddyconfig/httpcaddyfile/options.go
View File

@ -38,6 +38,7 @@ func init() {
RegisterGlobalOption("on_demand_tls", parseOptOnDemand)
RegisterGlobalOption("local_certs", parseOptTrue)
RegisterGlobalOption("key_type", parseOptSingleString)
RegisterGlobalOption("auto_https", parseOptAutoHTTPS)
}
func parseOptTrue(d *caddyfile.Dispenser) (interface{}, error) {
@ -264,3 +265,18 @@ func parseOptOnDemand(d *caddyfile.Dispenser) (interface{}, error) {
}
return ond, nil
}
func parseOptAutoHTTPS(d *caddyfile.Dispenser) (interface{}, error) {
d.Next() // consume parameter name
if !d.Next() {
return "", d.ArgErr()
}
val := d.Val()
if d.Next() {
return "", d.ArgErr()
}
if val != "off" && val != "disable_redirects" {
return "", d.Errf("auto_https must be either 'off' or 'disable_redirects'")
}
return val, nil
}