From 57a3ec18dca79ab4e8d624694d010519c4aa3851 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 15 Feb 2016 18:55:43 +0100 Subject: Yaml config --- cmd/acme/config.go | 21 ++++++++++++++------- cmd/acme/docker.yaml | 20 +++++++++----------- cmd/acme/main.go | 3 +++ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index ad2df73..0ff38e0 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -15,14 +15,21 @@ const defKeySize = 2048 type Config struct { Defaults defaults - Provider map[string]*provider - Account map[string]*account - Hook map[string]*hook - Desire map[string]*desire + Provider map[string]provider + Account map[string]account + Hook map[string]hook + Desire map[string]desire + Flow []flow +} + +type flow struct { + Provider string + Account string + Desire string } type defaults struct { - Gracetime + Gracetime time.Duration Listen string ListenTLS string Provider string @@ -110,7 +117,7 @@ func LoadConfig(fname string) (*Config, error) { return nil, errNoProvider } } - v.provider = c.Provider[v.Provider] + //v.provider = c.Provider[v.Provider] if v.Account == "" { if c.Defaults.Account != "" { v.Account = c.Defaults.Account @@ -118,7 +125,7 @@ func LoadConfig(fname string) (*Config, error) { return nil, errNoAccount } } - v.account = c.Account[v.Account] + //v.account = c.Account[v.Account] if v.KeySize == 0 { v.KeySize = c.Defaults.KeySize } diff --git a/cmd/acme/docker.yaml b/cmd/acme/docker.yaml index e3e969b..5715918 100644 --- a/cmd/acme/docker.yaml +++ b/cmd/acme/docker.yaml @@ -21,19 +21,17 @@ hook: cmd: sudo service nginx reload desire: docker: - provider: les - account: webmaster - altnames: - - docker.moccu.com - - test.docker.moccu.com + altnames: [ docker.moccu.com, test.docker.moccu.com ] key: private/docker_moccu_com.key cert: certs/docker_moccu_com.pem www: - provider: les - account: webmaster2 - altnames: - - www.docker.moccu.com - - docker.moccu.com + altnames: [ www.docker.moccu.com, docker.moccu.com ] key: private/www_docker_moccu_com.key cert: certs/www_docker_moccu_com.pem - +flow: + - desire: docker + account: webmaster + provider: les + - desire: www + account: webmaster2 + provider: les diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 070bba3..48b9ba0 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -3,6 +3,7 @@ package main import ( "flag" + "fmt" "log" "os" "runtime/trace" @@ -72,6 +73,8 @@ func main() { if err != nil { log.Fatal(err) } + fmt.Printf("%+v\n", conf) + return var httpSol, tlsSol acme.Solver if conf.Defaults.Listen != "" { -- cgit v1.2.3