From 5089cb612a18c284cd2721ded51fbebb7faf1498 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 29 Feb 2016 19:49:34 +0100 Subject: Back to normal --- cmd/acme/config.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'cmd/acme/config.go') diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 176891e..8aad4fa 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -144,18 +144,20 @@ func LoadConfig(fname string) (*Config, error) { return c, nil } -func (c *Config) Mkdirs() error { - key := keyPath - crt := crtPath - if c.BaseDir != "" { - key = path.Join(c.BaseDir, keyPath) - crt = path.Join(c.BaseDir, crtPath) - } - err := os.MkdirAll(key, 0700) +type Dirmaker interface { + Mkdirs() error +} + +func (a account) Mkdirs() error { + return os.MkdirAll(path.Dir(a.KeyFile), 0700) +} + +func (d domain) Mkdirs() error { + err := os.MkdirAll(path.Dir(d.KeyFile), 0700) if err != nil { return err } - return os.MkdirAll(crt, 0755) + return os.MkdirAll(path.Dir(d.CrtFile), 0755) } func replace(s string) string { -- cgit v1.2.3