From a881f863e9808821189c4e84ed119798cb3b5cd8 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 16 Mar 2016 19:22:30 +0100 Subject: Fix gracetime, add conf dumper --- cmd/acme/config.go | 6 +++++- cmd/acme/main.go | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 3e3cf40..9b15088 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -105,7 +105,7 @@ func LoadConfig(fname string) (*Config, error) { des.KeyFile = path.Join(c.BaseDir, keyPath, des.KeyFile) c.Desire[i] = des for i, dom := range des.Domain { - if dom.Gracetime != 0 { + if dom.Gracetime == 0 { dom.Gracetime = c.Gracetime } if dom.KeySize == 0 { @@ -155,3 +155,7 @@ func checkWWW(altnames []string) []string { } return altnames } + +func (c Config) dump() ([]byte, error) { + return yaml.Marshal(c) +} diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 4155404..b722d05 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -3,6 +3,7 @@ package main import ( "flag" + "fmt" "log" "time" @@ -12,6 +13,7 @@ import ( var ( confName = flag.String("conf", "", "configuration file") forceRenew = flag.Bool("force", false, "force renew") + dumpConfig = flag.Bool("dump", false, "dump parsed configuration") httpSol, tlsSol acme.Solver ) @@ -125,6 +127,15 @@ func main() { log.Fatal(err) } + if *dumpConfig { + out, err := conf.dump() + if err != nil { + log.Fatal(err) + } + fmt.Println(string(out)) + return + } + httpSol, err = acme.NewHTTPSolver(conf.Listen) if err != nil { log.Println("HTTP Solver", err) -- cgit v1.2.3