fix tls config
This commit is contained in:
parent
e50e1adeb1
commit
0983ecc52f
2
Makefile
2
Makefile
@ -2,7 +2,7 @@ NAME=gost
|
||||
BINDIR=bin
|
||||
VERSION=$(shell cat cmd/gost/version.go | grep 'version =' | sed 's/.*\"\(.*\)\".*/\1/g')
|
||||
GOBUILD=CGO_ENABLED=0 go build --ldflags="-s -w" -v -x -a
|
||||
GOFILES=cmd/gost/*
|
||||
GOFILES=cmd/gost/*.go
|
||||
|
||||
PLATFORM_LIST = \
|
||||
darwin-amd64 \
|
||||
|
@ -389,6 +389,8 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
|
||||
md.Del("auth")
|
||||
|
||||
tlsConfig := &config.TLSConfig{
|
||||
CertFile: metadata.GetString(md, "certFile"),
|
||||
KeyFile: metadata.GetString(md, "keyFile"),
|
||||
CAFile: metadata.GetString(md, "caFile"),
|
||||
Secure: metadata.GetBool(md, "secure"),
|
||||
ServerName: metadata.GetString(md, "serverName"),
|
||||
@ -396,11 +398,13 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
|
||||
if tlsConfig.ServerName == "" {
|
||||
tlsConfig.ServerName = url.Hostname()
|
||||
}
|
||||
md.Del("certFile")
|
||||
md.Del("keyFile")
|
||||
md.Del("caFile")
|
||||
md.Del("secure")
|
||||
md.Del("serverName")
|
||||
|
||||
if !tlsConfig.Secure && tlsConfig.CAFile == "" {
|
||||
if !tlsConfig.Secure && tlsConfig.CertFile == "" && tlsConfig.CAFile == "" {
|
||||
tlsConfig = nil
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
package main
|
||||
|
||||
const (
|
||||
version = "3.0.0-alpha.1"
|
||||
version = "3.0.0-alpha.2"
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user