Francis Lavoie
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
1 deletions
-
caddyconfig/httpcaddyfile/httptype.go
-
caddyconfig/httpcaddyfile/tlsapp.go
|
|
@ -307,6 +307,8 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options |
|
|
|
val, err = parseOptOnDemand(disp) |
|
|
|
case "local_certs": |
|
|
|
val = true |
|
|
|
case "key_type": |
|
|
|
val, err = parseOptSingleString(disp) |
|
|
|
default: |
|
|
|
return nil, fmt.Errorf("unrecognized parameter name: %s", dir) |
|
|
|
} |
|
|
|
|
|
@ -322,8 +322,9 @@ func newBaseAutomationPolicy(options map[string]interface{}, warnings []caddycon |
|
|
|
acmeCARoot, hasACMECARoot := options["acme_ca_root"] |
|
|
|
email, hasEmail := options["email"] |
|
|
|
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
|
|
|
|
// set, then we can just return right away
|
|
|
@ -363,6 +364,9 @@ func newBaseAutomationPolicy(options map[string]interface{}, warnings []caddycon |
|
|
|
if acmeCARoot != nil { |
|
|
|
mgr.TrustedRootsPEMFiles = []string{acmeCARoot.(string)} |
|
|
|
} |
|
|
|
if keyType != nil { |
|
|
|
ap.KeyType = keyType.(string) |
|
|
|
} |
|
|
|
ap.Issuer = mgr // we'll encode it later
|
|
|
|
} |
|
|
|
|
|
|
|