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 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'cmd/acme/config.go') 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 } -- cgit v1.2.3