1
0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00

PR review fixups on config options

This commit is contained in:
Nathan McCauley
2015-04-27 10:45:34 -07:00
parent 8403c09c1f
commit 39103bc6ef
2 changed files with 4 additions and 4 deletions

View File

@@ -4,7 +4,7 @@
"tls_cert_file": "../../fixtures/ca.pem",
"tls_key_file": "../../fixtures/ca-key.pem"
}
"signingservice":{
"trust_service":{
"type": "local"
"hostname": ""
"port": ""

View File

@@ -9,7 +9,7 @@ import (
// all other configuration is namespaced under
type Configuration struct {
Server ServerConf `json:"server,omitempty"`
TrustService TrustServiceConf `json:"signingservice,omitempty"`
TrustService TrustServiceConf `json:"trust_service,omitempty"`
}
// ServerConf specifically addresses configuration related to
@@ -25,8 +25,8 @@ type ServerConf struct {
// `remote` will be used for
type TrustServiceConf struct {
Type string `json:"type"`
Hostname string `json:"hostname"`
Port string `json:"port"`
Hostname string `json:"hostname,omitempty"`
Port string `json:"port,omitempty"`
}
// Load takes a filename (relative path from pwd) and attempts