Browse Source

Minor tweaks

master
Matthew Holt 4 years ago
parent
commit
d21e88ae3a
No known key found for this signature in database GPG Key ID: 2A349DD577D586A5
  1. 4
      modules/caddypki/ca.go
  2. 2
      modules/caddytls/pemloader.go

4
modules/caddypki/ca.go

@ -51,10 +51,10 @@ type CA struct {
// and Mozilla Firefox trust stores. Default: true. // and Mozilla Firefox trust stores. Default: true.
InstallTrust *bool `json:"install_trust,omitempty"` InstallTrust *bool `json:"install_trust,omitempty"`
// The root certificate to use; if empty, one will be generated. // The root certificate to use; if null, one will be generated.
Root *KeyPair `json:"root,omitempty"` Root *KeyPair `json:"root,omitempty"`
// The intermediate (signing) certificate; if empty, one will be generated. // The intermediate (signing) certificate; if null, one will be generated.
Intermediate *KeyPair `json:"intermediate,omitempty"` Intermediate *KeyPair `json:"intermediate,omitempty"`
// Optionally configure a separate storage module associated with this // Optionally configure a separate storage module associated with this

2
modules/caddytls/pemloader.go

@ -34,7 +34,7 @@ type PEMLoader []CertKeyPEMPair
func (PEMLoader) CaddyModule() caddy.ModuleInfo { func (PEMLoader) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{ return caddy.ModuleInfo{
ID: "tls.certificates.load_pem", ID: "tls.certificates.load_pem",
New: func() caddy.Module { return PEMLoader{} }, New: func() caddy.Module { return new(PEMLoader) },
} }
} }

Loading…
Cancel
Save