epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add flag to force TLS

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-09-15 17:49:36 -03:00
parent e9e20a5e79
commit 23d0d8e8d0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@@ -26,6 +26,7 @@ var UseLetsEncrypt bool
var LetsEncryptCertsDir string var LetsEncryptCertsDir string
var LetsEncryptDomains stringslice var LetsEncryptDomains stringslice
var MaxLoadAvg float64 var MaxLoadAvg float64
var ForceTLS bool
type stringslice []string type stringslice []string
@@ -41,6 +42,7 @@ func ParseFlags() {
flag.Var(&LetsEncryptDomains, "letsencrypt-domain", "List of domains to validate with let's encrypt") 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.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(&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(&PortNumber, "port", "3000", "Port number")
flag.StringVar(&Key, "key", "./pwd/server-key.pem", "Server key for SSL") flag.StringVar(&Key, "key", "./pwd/server-key.pem", "Server key for SSL")
flag.StringVar(&Cert, "cert", "./pwd/server.pem", "Give a SSL cert") flag.StringVar(&Cert, "cert", "./pwd/server.pem", "Give a SSL cert")

6
pwd/instance.go
View File

@@ -6,6 +6,7 @@ import (
"net" "net"
"time" "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/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "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 { if err != nil {
return nil, err return nil, err
} }
if config.ForceTLS {
conf.Tls = true
}
instance, err := prov.InstanceNew(session, conf) instance, err := prov.InstanceNew(session, conf)
if err != nil { if err != nil {
log.Println(err) log.Println(err)