OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

httpcaddyfile: Add key_type global option (#3231)

This commit is contained in:
Francis Lavoie 2020-04-08 13:09:38 -04:00 committed by GitHub
parent 4d9b63d909
commit 5110643201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caddyconfig/httpcaddyfile/httptype.go
View File

@ -307,6 +307,8 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options
val, err = parseOptOnDemand(disp) val, err = parseOptOnDemand(disp)
case "local_certs": case "local_certs":
val = true val = true
case "key_type":
val, err = parseOptSingleString(disp)
default: default:
return nil, fmt.Errorf("unrecognized parameter name: %s", dir) return nil, fmt.Errorf("unrecognized parameter name: %s", dir)
} }

6
caddyconfig/httpcaddyfile/tlsapp.go
View File

@ -322,8 +322,9 @@ func newBaseAutomationPolicy(options map[string]interface{}, warnings []caddycon
acmeCARoot, hasACMECARoot := options["acme_ca_root"] acmeCARoot, hasACMECARoot := options["acme_ca_root"]
email, hasEmail := options["email"] email, hasEmail := options["email"]
localCerts, hasLocalCerts := options["local_certs"] localCerts, hasLocalCerts := options["local_certs"]
keyType, hasKeyType := options["key_type"]
hasGlobalAutomationOpts := hasACMECA || hasACMEDNS || hasACMECARoot || hasEmail || hasLocalCerts hasGlobalAutomationOpts := hasACMECA || hasACMEDNS || hasACMECARoot || hasEmail || hasLocalCerts || hasKeyType
// if there are no global options related to automation policies // if there are no global options related to automation policies
// set, then we can just return right away // set, then we can just return right away
@ -363,6 +364,9 @@ func newBaseAutomationPolicy(options map[string]interface{}, warnings []caddycon
if acmeCARoot != nil { if acmeCARoot != nil {
mgr.TrustedRootsPEMFiles = []string{acmeCARoot.(string)} mgr.TrustedRootsPEMFiles = []string{acmeCARoot.(string)}
} }
if keyType != nil {
ap.KeyType = keyType.(string)
}
ap.Issuer = mgr // we'll encode it later ap.Issuer = mgr // we'll encode it later
} }