aboutsummaryrefslogtreecommitdiff
path: root/cmd/acme/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-15 19:09:47 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-15 19:09:47 +0100
commit914e5a47b570fa4b8961ff849cbe669aee000f44 (patch)
tree3c73fe788f386303b5d00239b3a500c758bab7b8 /cmd/acme/main.go
parent57a3ec18dca79ab4e8d624694d010519c4aa3851 (diff)
Simplify config outline
Diffstat (limited to 'cmd/acme/main.go')
-rw-r--r--cmd/acme/main.go108
1 files changed, 55 insertions, 53 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 48b9ba0..c483434 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -7,8 +7,6 @@ import (
"log"
"os"
"runtime/trace"
-
- "dim13.org/acme"
)
var (
@@ -16,6 +14,7 @@ var (
tracing = flag.String("trace", "", "trace output file")
)
+/*
func prepare(conf *Config) error {
var err error
@@ -57,6 +56,7 @@ func prepare(conf *Config) error {
return nil
}
+*/
func main() {
flag.Parse()
@@ -76,60 +76,62 @@ func main() {
fmt.Printf("%+v\n", conf)
return
- var httpSol, tlsSol acme.Solver
- if conf.Defaults.Listen != "" {
- httpSol, err = acme.NewHTTPSolver(conf.Defaults.Listen)
- if err != nil {
- log.Println(err)
+ /*
+ var httpSol, tlsSol acme.Solver
+ if conf.Defaults.Listen != "" {
+ httpSol, err = acme.NewHTTPSolver(conf.Defaults.Listen)
+ if err != nil {
+ log.Println(err)
+ }
}
- }
- if conf.Defaults.ListenTLS != "" {
- tlsSol, err = acme.NewTLSSolver(conf.Defaults.ListenTLS)
- if err != nil {
- log.Println(err)
+ if conf.Defaults.ListenTLS != "" {
+ tlsSol, err = acme.NewTLSSolver(conf.Defaults.ListenTLS)
+ if err != nil {
+ log.Println(err)
+ }
}
- }
- if err := prepare(conf); err != nil {
- log.Fatal(err)
- }
+ if err := prepare(conf); err != nil {
+ log.Fatal(err)
+ }
- // register accs first
- for k, des := range conf.Desire {
- if des.account.registered {
- continue
- }
- log.Println("register", k)
- err := des.provider.Register(des.account, des.account.Contacts)
- if err != nil {
- log.Fatal(err)
- }
- des.account.registered = true
- }
+ // register accs first
+ for k, des := range conf.Desire {
+ if des.account.registered {
+ continue
+ }
+ log.Println("register", k)
+ err := des.provider.Register(des.account, des.account.Contacts)
+ if err != nil {
+ log.Fatal(err)
+ }
+ des.account.registered = true
+ }
- // satisfice
- for k, des := range conf.Desire {
- log.Println("satisfice", k)
- if des.Webroot != "" {
- wrSol := acme.NewWebrootSolver(des.Webroot)
- des.RegisterSolver(wrSol)
- } else if httpSol != nil {
- des.RegisterSolver(httpSol)
- }
- if tlsSol != nil {
- des.RegisterSolver(tlsSol)
- }
- if !des.HasSolver() {
- log.Fatal("no Solver available")
- }
+ // satisfice
+ for k, des := range conf.Desire {
+ log.Println("satisfice", k)
+ if des.Webroot != "" {
+ wrSol := acme.NewWebrootSolver(des.Webroot)
+ des.RegisterSolver(wrSol)
+ } else if httpSol != nil {
+ des.RegisterSolver(httpSol)
+ }
+ if tlsSol != nil {
+ des.RegisterSolver(tlsSol)
+ }
+ if !des.HasSolver() {
+ log.Fatal("no Solver available")
+ }
- if err := des.provider.Authorize(des.account, des.Desire); err != nil {
- log.Fatal(err)
- }
- if err := des.provider.Bundle(des.account, des.Desire); err != nil {
- log.Fatal(err)
- }
- if err := des.Save(des.Cert, des.Key); err != nil {
- log.Fatal(err)
- }
- }
+ if err := des.provider.Authorize(des.account, des.Desire); err != nil {
+ log.Fatal(err)
+ }
+ if err := des.provider.Bundle(des.account, des.Desire); err != nil {
+ log.Fatal(err)
+ }
+ if err := des.Save(des.Cert, des.Key); err != nil {
+ log.Fatal(err)
+ }
+ }
+ */
}