docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mixed typo TlS -> TLS 

Signed-off-by: Sevki Hasirci <s@sevki.org>
This commit is contained in:
Sevki Hasirci 2015-07-20 21:14:45 +03:00
parent 16ea3cf3a3
commit ce3156f1eb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/daemon.go
View File

@ -123,8 +123,8 @@ func mainDaemon() {
} }
serverConfig = setPlatformServerConfig(serverConfig, daemonCfg) serverConfig = setPlatformServerConfig(serverConfig, daemonCfg)
if *flTlS { if *flTLS {
if *flTlSVerify { if *flTLSVerify {
tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert
} }
tlsConfig, err := tlsconfig.Server(tlsOptions) tlsConfig, err := tlsconfig.Server(tlsOptions)

8
docker/docker.go
View File

@ -92,8 +92,8 @@ func main() {
// Regardless of whether the user sets it to true or false, if they // Regardless of whether the user sets it to true or false, if they
// specify --tlsverify at all then we need to turn on tls // specify --tlsverify at all then we need to turn on tls
// *flTlsVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need to check that here as well // *flTlsVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need to check that here as well
if flag.IsSet("-tlsverify") || *flTlSVerify { if flag.IsSet("-tlsverify") || *flTLSVerify {
*flTlS = true *flTLS = true
} }
if *flDaemon { if *flDaemon {
@ -114,8 +114,8 @@ func main() {
protoAddrParts := strings.SplitN(flHosts[0], "://", 2) protoAddrParts := strings.SplitN(flHosts[0], "://", 2)
var tlsConfig *tls.Config var tlsConfig *tls.Config
if *flTlS { if *flTLS {
tlsOptions.InsecureSkipVerify = !*flTlSVerify tlsOptions.InsecureSkipVerify = !*flTLSVerify
if !flag.IsSet("-tlscert") { if !flag.IsSet("-tlscert") {
if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) { if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) {
tlsOptions.CertFile = "" tlsOptions.CertFile = ""

4
docker/flags.go
View File

@ -91,9 +91,9 @@ var (
flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode") flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode")
flDebug = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode") flDebug = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode")
flLogLevel = flag.String([]string{"l", "-log-level"}, "info", "Set the logging level") flLogLevel = flag.String([]string{"l", "-log-level"}, "info", "Set the logging level")
flTlS = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify") flTLS = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify")
flHelp = flag.Bool([]string{"h", "-help"}, false, "Print usage") flHelp = flag.Bool([]string{"h", "-help"}, false, "Print usage")
flTlSVerify = flag.Bool([]string{"-tlsverify"}, dockerTlSVerify, "Use TLS and verify the remote") flTLSVerify = flag.Bool([]string{"-tlsverify"}, dockerTlSVerify, "Use TLS and verify the remote")
// these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs // these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs
tlsOptions tlsconfig.Options tlsOptions tlsconfig.Options