aboutsummaryrefslogtreecommitdiff
path: root/cmd/acme/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-15 12:23:13 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-15 12:23:13 +0100
commitb38218d7d0cd043e95de6ccd85b46e63aebee22b (patch)
treed44c5cd9f2ba52ee651be841f4220f13b15cdd7a /cmd/acme/main.go
parentf2727dffe1a81b73178079cc821450510216652b (diff)
Restructure config
Diffstat (limited to 'cmd/acme/main.go')
-rw-r--r--cmd/acme/main.go26
1 files changed, 13 insertions, 13 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 050ee4c..4155404 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -15,28 +15,28 @@ var (
httpSol, tlsSol acme.Solver
)
-func load(a account) (*acme.Signer, error) {
- key, err := a.Load()
+func load(d desire) (*acme.Signer, error) {
+ key, err := d.Load()
if err != nil {
return nil, err
}
- log.Println("Load", a.KeyFile)
+ log.Println("Load", d.KeyFile)
return acme.NewSigner(key)
}
-func register(prov *acme.Provider, a account) (*acme.Signer, error) {
- key, err := acme.NewKey(a.KeySize)
+func register(prov *acme.Provider, d desire) (*acme.Signer, error) {
+ key, err := acme.NewKey(d.KeySize)
if err != nil {
return nil, err
}
- defer a.Save(key)
+ defer d.Save(key)
sig, err := acme.NewSigner(key)
if err != nil {
return nil, err
}
- con, err := acme.NewContacts(a.Mail, a.Phone)
+ con, err := acme.NewContacts(d.Mail, d.Phone)
if err != nil {
return nil, err
}
@@ -53,15 +53,15 @@ func register(prov *acme.Provider, a account) (*acme.Signer, error) {
return sig, nil
}
-func loadAccount(prov *acme.Provider, a account) error {
- sig, err := load(a)
+func loadAccount(prov *acme.Provider, d desire) error {
+ sig, err := load(d)
if err != nil {
- sig, err = register(prov, a)
+ sig, err = register(prov, d)
if err != nil {
return err
}
}
- for _, d := range a.Domain {
+ for _, d := range d.Domain {
if err := requestCert(prov, sig, d); err != nil {
return err
}
@@ -140,8 +140,8 @@ func main() {
log.Fatal(err)
}
- for _, a := range conf.Account {
- if err := loadAccount(prov, a); err != nil {
+ for _, d := range conf.Desire {
+ if err := loadAccount(prov, d); err != nil {
log.Fatal(err)
}
}