From 0c39b991e9289a41ef656220454aa08330209511 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 16 Feb 2016 13:58:44 +0100 Subject: Rename filed names --- cmd/acme/config.go | 24 ++++++++++++------------ cmd/acme/dim13.yaml | 32 -------------------------------- cmd/acme/dim13.yml | 32 ++++++++++++++++++++++++++++++++ cmd/acme/docker.yaml | 30 ------------------------------ cmd/acme/docker.yml | 30 ++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 cmd/acme/dim13.yaml create mode 100644 cmd/acme/dim13.yml delete mode 100644 cmd/acme/docker.yaml create mode 100644 cmd/acme/docker.yml (limited to 'cmd') diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 982f4ac..15c3403 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -29,7 +29,7 @@ type account struct { Mail string Phone string KeySize int - Key string + KeyFile string } type desire struct { @@ -37,8 +37,8 @@ type desire struct { Account string Altnames []string KeySize int - Key string - Cert string + KeyFile string + CrtFile string Webroot string Hook []string } @@ -46,8 +46,8 @@ type desire struct { var ( errNoProvider = errors.New("no provider specified") errNoAccount = errors.New("no account specified") - errNoKey = errors.New("no key specified") - errNoCert = errors.New("no cert specified") + errNoKey = errors.New("no key file specified") + errNoCrt = errors.New("no crt file specified") errNoAltNames = errors.New("no altnames specified") errNoMail = errors.New("no mail specified") ) @@ -80,11 +80,11 @@ func LoadConfig(fname string) (*Config, error) { if v.Mail == "" { return nil, errNoMail } - if v.Key == "" { + if v.KeyFile == "" { return nil, errNoKey } if c.BaseDir != "" { - v.Key = path.Join(c.BaseDir, v.Key) + v.KeyFile = path.Join(c.BaseDir, v.KeyFile) } c.Account[k] = v } @@ -98,15 +98,15 @@ func LoadConfig(fname string) (*Config, error) { if v.KeySize == 0 { v.KeySize = c.KeySize } - if v.Key == "" { + if v.KeyFile == "" { return nil, errNoKey } - if v.Cert == "" { - return nil, errNoCert + if v.CrtFile == "" { + return nil, errNoCrt } if c.BaseDir != "" { - v.Key = path.Join(c.BaseDir, v.Key) - v.Cert = path.Join(c.BaseDir, v.Cert) + v.KeyFile = path.Join(c.BaseDir, v.KeyFile) + v.CrtFile = path.Join(c.BaseDir, v.CrtFile) } v.Altnames = checkWWW(v.Altnames) c.Desire[k] = v diff --git a/cmd/acme/dim13.yaml b/cmd/acme/dim13.yaml deleted file mode 100644 index 99731e6..0000000 --- a/cmd/acme/dim13.yaml +++ /dev/null @@ -1,32 +0,0 @@ -listen: localhost:8080 -listentls: localhost:8443 -basedir: ~/.acme -provider: - letsencrypt: https://acme-v01.api.letsencrypt.org/directory -account: - postmaster: - mail: postmaster@dim13.org - key: private/postmaster.key - webmaster: - mail: webmaster@dim13.org - key: private/webmaster.key -desire: - mail: - provider: letsencrypt - account: postmaster - altnames: - - mail.dim13.org - - smtp.dim13.org - - imap.dim13.org - key: private/mail_dim13_org.key - cert: certs/mail_dim13_org.pem - web: - provider: letsencrypt - account: webmaster - altnames: - - www.dim13.org - - mail.dim13.org - - git.dim13.org - - cvs.dim13.org - key: private/www_dim13_org.key - cert: certs/www_dim13_org.pem diff --git a/cmd/acme/dim13.yml b/cmd/acme/dim13.yml new file mode 100644 index 0000000..65efda0 --- /dev/null +++ b/cmd/acme/dim13.yml @@ -0,0 +1,32 @@ +listen: localhost:8080 +listentls: localhost:8443 +basedir: ~/.acme +provider: + letsencrypt: https://acme-v01.api.letsencrypt.org/directory +account: + postmaster: + mail: postmaster@dim13.org + keyfile: private/postmaster.key + webmaster: + mail: webmaster@dim13.org + keyfile: private/webmaster.key +desire: + mail: + provider: letsencrypt + account: postmaster + altnames: + - mail.dim13.org + - smtp.dim13.org + - imap.dim13.org + keyfile: private/mail_dim13_org.key + crtfile: certs/mail_dim13_org.pem + web: + provider: letsencrypt + account: webmaster + altnames: + - www.dim13.org + - mail.dim13.org + - git.dim13.org + - cvs.dim13.org + keyfile: private/www_dim13_org.key + crtfile: certs/www_dim13_org.pem diff --git a/cmd/acme/docker.yaml b/cmd/acme/docker.yaml deleted file mode 100644 index 5a7f813..0000000 --- a/cmd/acme/docker.yaml +++ /dev/null @@ -1,30 +0,0 @@ -gracetime: 168h -listen: localhost:8080 -listentls: localhost:8443 -basedir: .acme -keysize: 2048 -provider: - les: https://acme-staging.api.letsencrypt.org/directory - le: https://acme-v1.api.letsencrypt.org/directory -account: - webmaster: - mail: webmaster@docker.moccu.com - key: private/webmaster.key - webmaster2: - mail: webmaster@docker.moccu.com - key: private/webmaster2.key -hook: - nginx: sudo service nginx reload -desire: - docker: - provider: les - account: webmaster - altnames: [ docker.moccu.com, test.docker.moccu.com ] - key: private/docker_moccu_com.key - cert: certs/docker_moccu_com.pem - www: - provider: les - account: webmaster2 - altnames: [ www.docker.moccu.com, docker.moccu.com ] - key: private/www_docker_moccu_com.key - cert: certs/www_docker_moccu_com.pem diff --git a/cmd/acme/docker.yml b/cmd/acme/docker.yml new file mode 100644 index 0000000..f74493b --- /dev/null +++ b/cmd/acme/docker.yml @@ -0,0 +1,30 @@ +gracetime: 168h +listen: localhost:8080 +listentls: localhost:8443 +basedir: .acme +keysize: 2048 +provider: + les: https://acme-staging.api.letsencrypt.org/directory + le1: https://acme-v1.api.letsencrypt.org/directory +account: + webmaster: + mail: webmaster@docker.moccu.com + keyfile: private/webmaster.key + webmaster2: + mail: webmaster@docker.moccu.com + keyfile: private/webmaster2.key +hook: + nginx: sudo service nginx reload +desire: + docker: + provider: les + account: webmaster + altnames: [ docker.moccu.com, test.docker.moccu.com ] + keyfile: private/docker_moccu_com.key + crtfile: certs/docker_moccu_com.pem + www: + provider: les + account: webmaster2 + 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