From ce3156f1ebab0857b686682b317410f0eb27f6d5 Mon Sep 17 00:00:00 2001 From: Sevki Hasirci Date: Mon, 20 Jul 2015 21:14:45 +0300 Subject: [PATCH] fix mixed typo TlS -> TLS Signed-off-by: Sevki Hasirci --- docker/daemon.go | 4 ++-- docker/docker.go | 8 ++++---- docker/flags.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/daemon.go b/docker/daemon.go index 338d6208b..e7e0dfe3f 100644 --- a/docker/daemon.go +++ b/docker/daemon.go @@ -123,8 +123,8 @@ func mainDaemon() { } serverConfig = setPlatformServerConfig(serverConfig, daemonCfg) - if *flTlS { - if *flTlSVerify { + if *flTLS { + if *flTLSVerify { tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert } tlsConfig, err := tlsconfig.Server(tlsOptions) diff --git a/docker/docker.go b/docker/docker.go index 195c4ab12..b589f9444 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -92,8 +92,8 @@ func main() { // Regardless of whether the user sets it to true or false, if they // 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 - if flag.IsSet("-tlsverify") || *flTlSVerify { - *flTlS = true + if flag.IsSet("-tlsverify") || *flTLSVerify { + *flTLS = true } if *flDaemon { @@ -114,8 +114,8 @@ func main() { protoAddrParts := strings.SplitN(flHosts[0], "://", 2) var tlsConfig *tls.Config - if *flTlS { - tlsOptions.InsecureSkipVerify = !*flTlSVerify + if *flTLS { + tlsOptions.InsecureSkipVerify = !*flTLSVerify if !flag.IsSet("-tlscert") { if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) { tlsOptions.CertFile = "" diff --git a/docker/flags.go b/docker/flags.go index b53c76011..9243b46f4 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -91,9 +91,9 @@ var ( flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode") flDebug = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode") 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") - 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 tlsOptions tlsconfig.Options