From 32e326107df67006aa5d5a729b4f5301d84747d2 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 29 Dec 2015 23:01:03 +0100 Subject: Bikeshadding --- cmd/acme/main.go | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index bf05ce9..2213446 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -56,36 +56,28 @@ func saveCert(k Cert, crt []byte) error { return acme.SaveCert(fd, crt) } -func chkKeys(c *Config) error { - var err error +func main() { + flag.Parse() + conf, err := LoadConfig(*confName) + if err != nil { + log.Fatal(err) + } + for k, acc := range c.Account { acc.key, err = chkKey(acc) if err != nil { - return err + log.Fatal(err) } c.Account[k] = acc } + for k, des := range c.Desire { des.key, err = chkKey(des) if err != nil { - return err + log.Fatal(err) } c.Desire[k] = des } - return nil -} - -func main() { - flag.Parse() - conf, err := LoadConfig(*confName) - if err != nil { - log.Fatal(err) - } - - err = chkKeys(conf) - if err != nil { - log.Fatal(err) - } for k, des := range conf.Desire { a, _ := acme.NewAccount(des.account.key) -- cgit v1.2.3