aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-18 19:50:27 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-18 19:50:27 +0100
commit0f0d5ff117afdb1500f37d3d418379efc7201184 (patch)
tree43bbf95ff851efefdfccdfd3dc1fe72d5ab1fab5 /cmd
parent1fa9120f4550659418c54960d6e11f188003280a (diff)
Fix backup
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/docker.toml6
-rw-r--r--cmd/acme/main.go10
2 files changed, 12 insertions, 4 deletions
diff --git a/cmd/acme/docker.toml b/cmd/acme/docker.toml
index 7a2abae..e0aef36 100644
--- a/cmd/acme/docker.toml
+++ b/cmd/acme/docker.toml
@@ -13,6 +13,10 @@ directory = "https://acme-staging.api.letsencrypt.org/directory"
mail = "webmaster@docker.moccu.com"
key = "private/webmaster.key"
+[account.webmaster2]
+mail = "webmaster@docker.moccu.com"
+key = "private/webmaster2.key"
+
[desire.docker]
provider = "les"
account = "webmaster"
@@ -24,7 +28,7 @@ cert = "certs/docker_moccu_com.pem"
[desire.www]
provider = "les"
-account = "webmaster"
+account = "webmaster2"
altnames = [ "www.docker.moccu.com" ]
key = "private/www_docker_moccu_com.key"
cert = "certs/www_docker_moccu_com.pem"
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 28041f4..0dc9fa2 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -25,13 +25,14 @@ func prepare(conf *Config) error {
log.Println("LoadAccount", k)
acc.Account, err = acme.LoadAccount(acc.Key)
if err != nil {
- log.Println(err)
log.Println("NewAccount", k)
acc.Account, err = acme.NewAccount(acc.KeySize)
if err != nil {
return err
}
- acc.Account.SaveKey(acc.Key)
+ if err := acc.Account.SaveKey(acc.Key); err != nil {
+ return err
+ }
acc.pending = true
}
acc.Contacts.AddMail(acc.Mail)
@@ -55,6 +56,7 @@ func satisfice(des *desire) error {
var err error
if des.account.pending {
+ log.Println("register pending account")
err = des.provider.Register(des.account, des.account.Contacts)
if err != nil {
return err
@@ -74,7 +76,9 @@ func satisfice(des *desire) error {
return err
}
- des.Save(des.Cert, des.Key)
+ if err := des.Save(des.Cert, des.Key); err != nil {
+ return err
+ }
return nil
}