aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-16 13:58:44 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-16 13:58:44 +0100
commit0c39b991e9289a41ef656220454aa08330209511 (patch)
treef793eb4f4a0ea39af2de34b5e45c4f89774b82a8
parent7f6dd28284d989019baaf63f84825814e3734b59 (diff)
Rename filed names
-rw-r--r--cmd/acme/config.go24
-rw-r--r--cmd/acme/dim13.yml (renamed from cmd/acme/dim13.yaml)12
-rw-r--r--cmd/acme/docker.yml (renamed from cmd/acme/docker.yaml)14
3 files changed, 25 insertions, 25 deletions
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.yml
index 99731e6..65efda0 100644
--- a/cmd/acme/dim13.yaml
+++ b/cmd/acme/dim13.yml
@@ -6,10 +6,10 @@ provider:
account:
postmaster:
mail: postmaster@dim13.org
- key: private/postmaster.key
+ keyfile: private/postmaster.key
webmaster:
mail: webmaster@dim13.org
- key: private/webmaster.key
+ keyfile: private/webmaster.key
desire:
mail:
provider: letsencrypt
@@ -18,8 +18,8 @@ desire:
- mail.dim13.org
- smtp.dim13.org
- imap.dim13.org
- key: private/mail_dim13_org.key
- cert: certs/mail_dim13_org.pem
+ keyfile: private/mail_dim13_org.key
+ crtfile: certs/mail_dim13_org.pem
web:
provider: letsencrypt
account: webmaster
@@ -28,5 +28,5 @@ desire:
- mail.dim13.org
- git.dim13.org
- cvs.dim13.org
- key: private/www_dim13_org.key
- cert: certs/www_dim13_org.pem
+ keyfile: private/www_dim13_org.key
+ crtfile: certs/www_dim13_org.pem
diff --git a/cmd/acme/docker.yaml b/cmd/acme/docker.yml
index 5a7f813..f74493b 100644
--- a/cmd/acme/docker.yaml
+++ b/cmd/acme/docker.yml
@@ -5,14 +5,14 @@ basedir: .acme
keysize: 2048
provider:
les: https://acme-staging.api.letsencrypt.org/directory
- le: https://acme-v1.api.letsencrypt.org/directory
+ le1: https://acme-v1.api.letsencrypt.org/directory
account:
webmaster:
mail: webmaster@docker.moccu.com
- key: private/webmaster.key
+ keyfile: private/webmaster.key
webmaster2:
mail: webmaster@docker.moccu.com
- key: private/webmaster2.key
+ keyfile: private/webmaster2.key
hook:
nginx: sudo service nginx reload
desire:
@@ -20,11 +20,11 @@ desire:
provider: les
account: webmaster
altnames: [ docker.moccu.com, test.docker.moccu.com ]
- key: private/docker_moccu_com.key
- cert: certs/docker_moccu_com.pem
+ 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 ]
- key: private/www_docker_moccu_com.key
- cert: certs/www_docker_moccu_com.pem
+ keyfile: private/www_docker_moccu_com.key
+ crtfile: certs/www_docker_moccu_com.pem