serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-13 22:36:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: Ensure certmagic defaults are set for any and all subcommands

Browse source 
This is really crucial and I'm surprised no one reported a problem yet
This commit is contained in:
Matthew Holt 2020-03-23 14:43:42 -06:00
parent ee64719d93
commit 4b4e16edaf
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/commandfuncs.go
View file

@ -35,7 +35,6 @@ import (
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/certmagic"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -184,15 +183,6 @@ func cmdRun(fl Flags) (int, error) {
} }
} }
// set a fitting User-Agent for ACME requests
goModule := caddy.GoModule()
cleanModVersion := strings.TrimPrefix(goModule.Version, "v")
certmagic.UserAgent = "Caddy/" + cleanModVersion
// by using Caddy, user indicates agreement to CA terms
// (very important, or ACME account creation will fail!)
certmagic.DefaultACME.Agreed = true
// run the initial config // run the initial config
err = caddy.Load(config, true) err = caddy.Load(config, true)
if err != nil { if err != nil {

12
cmd/main.go
View file

@ -30,9 +30,21 @@ import (
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/certmagic"
"go.uber.org/zap" "go.uber.org/zap"
) )
func init() {
// set a fitting User-Agent for ACME requests
goModule := caddy.GoModule()
cleanModVersion := strings.TrimPrefix(goModule.Version, "v")
certmagic.UserAgent = "Caddy/" + cleanModVersion
// by using Caddy, user indicates agreement to CA terms
// (very important, or ACME account creation will fail!)
certmagic.DefaultACME.Agreed = true
}
// Main implements the main function of the caddy command. // Main implements the main function of the caddy command.
// Call this if Caddy is to be the main() if your program. // Call this if Caddy is to be the main() if your program.
func Main() { func Main() {