aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-12-29 23:01:03 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-12-29 23:01:03 +0100
commit32e326107df67006aa5d5a729b4f5301d84747d2 (patch)
tree52a23c417b362281cca752b47c4b0f84759cd02b /cmd
parent09bb6e70f7a25f0ec16cd73a82211cc6801a95a8 (diff)
Bikeshadding
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/config.go39
-rw-r--r--cmd/acme/main.go28
2 files changed, 32 insertions, 35 deletions
diff --git a/cmd/acme/config.go b/cmd/acme/config.go
index 6e260df..e904e96 100644
--- a/cmd/acme/config.go
+++ b/cmd/acme/config.go
@@ -9,6 +9,8 @@ import (
"strings"
"time"
+ "dim13.org/acme"
+
"github.com/BurntSushi/toml"
)
@@ -37,11 +39,13 @@ type provider struct {
}
type account struct {
- Mail string
- Phone string
- Size int
- Key string
- key *rsa.PrivateKey
+ Mail string
+ Phone string
+ Size int
+ Key string
+ key *rsa.PrivateKey
+ account *acme.Account
+ needsRegister bool
}
type hook struct {
@@ -49,18 +53,19 @@ type hook struct {
}
type desire struct {
- Provider string
- Account string
- Altnames []string
- Size int
- Key string
- Cert string
- Webroot string
- Hooks []string
- provider *provider
- account *account
- key *rsa.PrivateKey
- cert *x509.Certificate
+ Provider string
+ Account string
+ Altnames []string
+ Size int
+ Key string
+ Cert string
+ Webroot string
+ Hooks []string
+ provider *provider
+ account *account
+ key *rsa.PrivateKey
+ chain []*x509.Certificate
+ needsNewCert bool
}
var (
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)