diff options
author | Jordi Masip <masipcat@users.noreply.github.com> | 2021-01-06 20:02:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-06 12:02:58 -0700 |
commit | 8b6fdc04da5b31d8cb62b9d2574d16afe81ad549 (patch) | |
tree | 0a1e69f78adc71f68a4dbdc85f7c90b7e1fd0170 /caddyconfig/httpcaddyfile/builtins.go | |
parent | f0216967dca12831b1aac351fc8c4bfcea148697 (diff) |
caddytls: add 'key_type' subdirective (#3956)
* caddytls: add 'key_type' subdirective
* Suggested change
* *string -> string
* test
Diffstat (limited to 'caddyconfig/httpcaddyfile/builtins.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/builtins.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go index 7d16da1..08dfa88 100644 --- a/caddyconfig/httpcaddyfile/builtins.go +++ b/caddyconfig/httpcaddyfile/builtins.go @@ -87,6 +87,7 @@ func parseTLS(h Helper) ([]ConfigValue, error) { var folderLoader caddytls.FolderLoader var certSelector caddytls.CustomCertSelectionPolicy var acmeIssuer *caddytls.ACMEIssuer + var keyType string var internalIssuer *caddytls.InternalIssuer var issuers []certmagic.Issuer var onDemand bool @@ -267,6 +268,13 @@ func parseTLS(h Helper) ([]ConfigValue, error) { } acmeIssuer.CA = arg[0] + case "key_type": + arg := h.RemainingArgs() + if len(arg) != 1 { + return nil, h.ArgErr() + } + keyType = arg[0] + case "eab": arg := h.RemainingArgs() if len(arg) != 2 { @@ -384,6 +392,13 @@ func parseTLS(h Helper) ([]ConfigValue, error) { }) } + if keyType != "" { + configVals = append(configVals, ConfigValue{ + Class: "tls.key_type", + Value: keyType, + }) + } + // on-demand TLS if onDemand { configVals = append(configVals, ConfigValue{ |