aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-12-15 18:05:37 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-12-15 18:05:37 +0100
commita7abf8d4dae435e2cb11d947aaa1685fc33c2b8c (patch)
treee94d9b875e6b4187fbecafd5c7da732de26c9919 /cmd
parent83a00e54c5b3be283e570660c43af514a7362810 (diff)
Bring pieces closer together
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acmed/config.go6
-rw-r--r--cmd/acmed/main.go2
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd/acmed/config.go b/cmd/acmed/config.go
index fdd931b..faf7383 100644
--- a/cmd/acmed/config.go
+++ b/cmd/acmed/config.go
@@ -82,9 +82,6 @@ func LoadConfig(fname string) (*Config, error) {
c.Account[k] = v
}
for k, v := range c.Desire {
- if v.KeySize == 0 {
- v.KeySize = c.Defaults.KeySize
- }
if v.Provider == "" {
if c.Defaults.Provider != "" {
v.Provider = c.Defaults.Provider
@@ -101,6 +98,9 @@ func LoadConfig(fname string) (*Config, error) {
}
}
v.account = c.Account[v.Account]
+ if v.KeySize == 0 {
+ v.KeySize = c.Defaults.KeySize
+ }
if v.Key == "" {
return nil, errNoKey
}
diff --git a/cmd/acmed/main.go b/cmd/acmed/main.go
index b6602f7..202fe58 100644
--- a/cmd/acmed/main.go
+++ b/cmd/acmed/main.go
@@ -73,6 +73,4 @@ func main() {
}
conf.Desire[k] = des
}
-
- log.Println(conf)
}