aboutsummaryrefslogtreecommitdiff
path: root/cmd/acme/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-06 02:26:20 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-06 02:26:20 +0100
commitcf49d970245fdd871a85c9393a54bdefcbdfc39a (patch)
treec793c47b5837c21e1d8c13e7604651f471de6cb7 /cmd/acme/main.go
parent15d5478b1ebbeab7e34ead678d4d963ed736be9a (diff)
Move file handling out of the lib
Diffstat (limited to 'cmd/acme/main.go')
-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 721d204..50855d9 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -41,10 +41,22 @@ func main() {
for _, v := range v.Account {
log.Println("Load", v.KeyFile)
- acc, err := getAccount(v.KeyFile, v.KeySize)
+ key, err := v.Load()
+ if err != nil {
+ key, err = acme.NewKey(v.KeySize)
+ if err != nil {
+ log.Fatal(err)
+ }
+ }
+ if err := v.Save(key); err != nil {
+ log.Fatal(err)
+ }
+
+ acc, err := acme.NewAccount(key)
if err != nil {
log.Fatal(err)
}
+
con := acme.Contacts{}
con.AddMail(v.Mail)
con.AddPhone(v.Phone)
@@ -84,21 +96,10 @@ func main() {
}
log.Println("Save", v.CrtFile, v.KeyFile)
- if err := des.SaveKeyPair(v.CrtFile, v.KeyFile); err != nil {
+ if err := v.Save(des.Cert()); err != nil {
log.Fatal(err)
}
}
}
}
}
-
-func getAccount(keyFile string, keySize int) (*acme.Account, error) {
- acc, err := acme.LoadAccount(keyFile)
- if err != nil {
- acc, err = acme.NewAccount(keySize)
- if err != nil {
- return nil, err
- }
- }
- return acc, acc.Save(keyFile)
-}