From 919875a65fc7f343e5ed6309fd45bd1c35e63f87 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 29 Jan 2016 14:56:57 +0100 Subject: Make listen explicit --- cmd/acme/config.go | 6 ------ cmd/acme/docker.toml | 1 + cmd/acme/main.go | 17 +++++++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 3187768..0addfaf 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -83,12 +83,6 @@ func LoadConfig(fname string) (*Config, error) { if c.Defaults.KeySize == 0 { c.Defaults.KeySize = defKeySize } - if c.Defaults.Listen == "" { - c.Defaults.Listen = "localhost:8080" - } - if c.Defaults.ListenTLS == "" { - c.Defaults.ListenTLS = "localhost:8443" - } for k, v := range c.Account { if v.KeySize == 0 { v.KeySize = c.Defaults.KeySize diff --git a/cmd/acme/docker.toml b/cmd/acme/docker.toml index e0aef36..eb31816 100644 --- a/cmd/acme/docker.toml +++ b/cmd/acme/docker.toml @@ -1,6 +1,7 @@ [defaults] gracetime = "168h" # 1 week listen = "localhost:8080" +listentls = "localhost:8443" basedir = ".acme" # usually "/etc/ssl" provider = "les" account = "webmaster" diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 7a144c0..cd2c304 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -86,13 +86,18 @@ func main() { log.Fatal(err) } - httpSol, err := acme.NewHTTPSolver(conf.Defaults.Listen) - if err != nil { - log.Println(err) + var httpSol, tlsSol acme.Solver + if conf.Defaults.Listen != "" { + httpSol, err = acme.NewHTTPSolver(conf.Defaults.Listen) + if err != nil { + log.Println(err) + } } - tlsSol, err := acme.NewTLSSolver(conf.Defaults.ListenTLS) - if err != nil { - log.Println(err) + if conf.Defaults.ListenTLS != "" { + tlsSol, err = acme.NewTLSSolver(conf.Defaults.ListenTLS) + if err != nil { + log.Println(err) + } } for k, des := range conf.Desire { -- cgit v1.2.3