From 2ee60dbeaa032df6bfe9e50e6b57f1d68c71ae13 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 26 Feb 2016 01:00:24 +0100 Subject: Rename desire into domain --- cmd/acme/config.go | 22 +++++++++++----------- cmd/acme/dim13.yml | 4 ++-- cmd/acme/docker.yml | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index be830fd..7421229 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -39,10 +39,10 @@ type account struct { Phone string KeySize int KeyFile string - Desire []desire + Domain []domain } -type desire struct { +type domain struct { Altnames []string KeySize int KeyFile string @@ -112,22 +112,22 @@ func LoadConfig(fname string) (*Config, error) { acc.KeyFile = path.Join(c.BaseDir, acc.KeyFile) } pro.Account[i] = acc - for i, des := range acc.Desire { - if des.KeySize == 0 { - des.KeySize = c.KeySize + for i, dom := range acc.Domain { + if dom.KeySize == 0 { + dom.KeySize = c.KeySize } - if des.KeyFile == "" { + if dom.KeyFile == "" { return nil, errNoKey } - if des.CrtFile == "" { + if dom.CrtFile == "" { return nil, errNoCrt } if c.BaseDir != "" { - des.KeyFile = path.Join(c.BaseDir, des.KeyFile) - des.CrtFile = path.Join(c.BaseDir, des.CrtFile) + dom.KeyFile = path.Join(c.BaseDir, dom.KeyFile) + dom.CrtFile = path.Join(c.BaseDir, dom.CrtFile) } - des.Altnames = checkWWW(des.Altnames) - acc.Desire[i] = des + dom.Altnames = checkWWW(dom.Altnames) + acc.Domain[i] = dom } } } diff --git a/cmd/acme/dim13.yml b/cmd/acme/dim13.yml index 209ea74..9f34d0c 100644 --- a/cmd/acme/dim13.yml +++ b/cmd/acme/dim13.yml @@ -6,7 +6,7 @@ provider: - account: - mail: postmaster@dim13.org keyfile: private/postmaster.key - desire: + domain: - altnames: - mail.dim13.org - smtp.dim13.org @@ -16,7 +16,7 @@ provider: hook: [ dovecot, smtpd ] - mail: webmaster@dim13.org keyfile: private/webmaster.key - desire: + domain: - altnames: - www.dim13.org keyfile: private/www_dim13_org.key diff --git a/cmd/acme/docker.yml b/cmd/acme/docker.yml index 4a9749d..63ba42a 100644 --- a/cmd/acme/docker.yml +++ b/cmd/acme/docker.yml @@ -9,13 +9,13 @@ provider: account: - mail: webmaster@docker.moccu.com keyfile: private/webmaster.key - desire: + domain: - altnames: [ docker.moccu.com, test.docker.moccu.com ] keyfile: private/docker_moccu_com.key crtfile: certs/docker_moccu_com.pem - mail: webmaster2@docker.moccu.com keyfile: private/webmaster2.key - desire: + domain: - altnames: [ www.docker.moccu.com, docker.moccu.com ] keyfile: private/www_docker_moccu_com.key crtfile: certs/www_docker_moccu_com.pem -- cgit v1.2.3