aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-28 18:41:19 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-28 18:41:19 +0100
commitd784c62fe5e31c9b2b51d03df0bd49e9374c4f1c (patch)
tree9fa2e130ad12273ab19114d80615a03a654145ed
parent2626a6b2adf57b167ee6eb3351c1c24a4ec78698 (diff)
Dial last
-rw-r--r--cmd/acme/main.go27
1 files changed, 14 insertions, 13 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 53b4352..be7c0da 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -12,15 +12,6 @@ var confName = flag.String("conf", "acme.toml", "configuration file")
func prepare(conf *Config) error {
var err error
- for k, pro := range conf.Provider {
- log.Println("DialProvider", k)
- pro.Provider, err = acme.DialProvider(pro.Directory)
- if err != nil {
- return err
- }
- conf.Provider[k] = pro
- }
-
for k, acc := range conf.Account {
log.Println("LoadAccount", k)
acc.Account, err = acme.LoadAccount(acc.Key)
@@ -49,6 +40,15 @@ func prepare(conf *Config) error {
conf.Desire[k] = des
}
+ for k, pro := range conf.Provider {
+ log.Println("DialProvider", k)
+ pro.Provider, err = acme.DialProvider(pro.Directory)
+ if err != nil {
+ return err
+ }
+ conf.Provider[k] = pro
+ }
+
return nil
}
@@ -87,10 +87,11 @@ func main() {
}
httpSol := acme.NewHTTPSolver(conf.Defaults.Listen)
- tlsSol := acme.NewTLSSolver(conf.Defaults.ListenTLS)
-
- tlsSol.Solve("a", "B")
- return
+ /*
+ tlsSol := acme.NewTLSSolver(conf.Defaults.ListenTLS)
+ tlsSol.Solve("a", "B")
+ return
+ */
for k, des := range conf.Desire {
if des.Webroot != "" {