From d784c62fe5e31c9b2b51d03df0bd49e9374c4f1c Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 28 Jan 2016 18:41:19 +0100 Subject: Dial last --- cmd/acme/main.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 53b4352..be7c0da 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -12,15 +12,6 @@ var confName = flag.String("conf", "acme.toml", "configuration file") func prepare(conf *Config) error { var err error - for k, pro := range conf.Provider { - log.Println("DialProvider", k) - pro.Provider, err = acme.DialProvider(pro.Directory) - if err != nil { - return err - } - conf.Provider[k] = pro - } - for k, acc := range conf.Account { log.Println("LoadAccount", k) acc.Account, err = acme.LoadAccount(acc.Key) @@ -49,6 +40,15 @@ func prepare(conf *Config) error { conf.Desire[k] = des } + for k, pro := range conf.Provider { + log.Println("DialProvider", k) + pro.Provider, err = acme.DialProvider(pro.Directory) + if err != nil { + return err + } + conf.Provider[k] = pro + } + return nil } @@ -87,10 +87,11 @@ func main() { } httpSol := acme.NewHTTPSolver(conf.Defaults.Listen) - tlsSol := acme.NewTLSSolver(conf.Defaults.ListenTLS) - - tlsSol.Solve("a", "B") - return + /* + tlsSol := acme.NewTLSSolver(conf.Defaults.ListenTLS) + tlsSol.Solve("a", "B") + return + */ for k, des := range conf.Desire { if des.Webroot != "" { -- cgit v1.2.3