aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-14 01:53:45 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-14 01:53:45 +0100
commit6c9e395879e4fae6d0b71f29b7845c7f667f308b (patch)
treee70d9f2385398c51162e235b800f325e6681b7de /cmd
parentf835c565941cbb2cd4adb62ab40db476a8318335 (diff)
Resort a bit
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go44
1 files changed, 21 insertions, 23 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index e4b4a04..dea5dc7 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -51,36 +51,31 @@ func prepare(conf *Config) error {
return nil
}
-func execute(conf *Config) error {
+func satisfice(des *desire) error {
var err error
- for k, des := range conf.Desire {
- if des.account.pending {
- err = des.provider.Register(des.account, des.account.Contacts)
- if err != nil {
- return err
- }
- }
-
- hs := &httpChallenge{Webroot: des.Webroot}
- des.RegisterSolver(acme.ChallengeHTTP, hs)
-
- log.Println("process", k)
-
- err = des.provider.Authorize(des.account, des.Desire)
+ if des.account.pending {
+ err = des.provider.Register(des.account, des.account.Contacts)
if err != nil {
return err
}
+ }
- err = des.provider.Cert(des.account, des.Desire)
- if err != nil {
- return err
- }
+ hs := &httpChallenge{Webroot: des.Webroot}
+ des.RegisterSolver(acme.ChallengeHTTP, hs)
+
+ err = des.provider.Authorize(des.account, des.Desire)
+ if err != nil {
+ return err
+ }
- des.SaveKey(des.Key)
- des.SaveCert(des.Cert)
+ err = des.provider.Cert(des.account, des.Desire)
+ if err != nil {
+ return err
}
+ des.Save(des.Cert, des.Key)
+
return nil
}
@@ -94,7 +89,10 @@ func main() {
log.Fatal(err)
}
httpSolver(conf.Defaults.Listen)
- if err := execute(conf); err != nil {
- log.Fatal(err)
+ for k, des := range conf.Desire {
+ log.Println("satisfice", k)
+ if err := satisfice(des); err != nil {
+ log.Fatal(err)
+ }
}
}