From 23d0d8e8d0c0952109e1d178c9d2df5e5cceec82 Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Fri, 15 Sep 2017 17:49:36 -0300 Subject: [PATCH] Add flag to force TLS --- config/config.go | 2 ++ pwd/instance.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/config/config.go b/config/config.go index 29e5039..0a09229 100644 --- a/config/config.go +++ b/config/config.go @@ -26,6 +26,7 @@ var UseLetsEncrypt bool var LetsEncryptCertsDir string var LetsEncryptDomains stringslice var MaxLoadAvg float64 +var ForceTLS bool type stringslice []string @@ -41,6 +42,7 @@ func ParseFlags() { flag.Var(&LetsEncryptDomains, "letsencrypt-domain", "List of domains to validate with let's encrypt") flag.StringVar(&LetsEncryptCertsDir, "letsencrypt-certs-dir", "/certs", "Path where let's encrypt certs will be stored") flag.BoolVar(&UseLetsEncrypt, "use-letsencrypt", false, "Enabled let's encrypt tls certificates") + flag.BoolVar(&ForceTLS, "tls", false, "Use TLS to connect to docker daemons") flag.StringVar(&PortNumber, "port", "3000", "Port number") flag.StringVar(&Key, "key", "./pwd/server-key.pem", "Server key for SSL") flag.StringVar(&Cert, "cert", "./pwd/server.pem", "Give a SSL cert") diff --git a/pwd/instance.go b/pwd/instance.go index 7ef7a51..9502ee0 100644 --- a/pwd/instance.go +++ b/pwd/instance.go @@ -6,6 +6,7 @@ import ( "net" "time" + "github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/pwd/types" ) @@ -113,6 +114,11 @@ func (p *pwd) InstanceNew(session *types.Session, conf types.InstanceConfig) (*t if err != nil { return nil, err } + + if config.ForceTLS { + conf.Tls = true + } + instance, err := prov.InstanceNew(session, conf) if err != nil { log.Println(err)