|
@@ -308,7 +308,7 @@ func (server *Server) createListener(addr string, conf listenerConfig, bindMode
|
308
|
308
|
return
|
309
|
309
|
} else if err == nil {
|
310
|
310
|
var proxyLine string
|
311
|
|
- if conf.IsTLSProxy {
|
|
311
|
+ if conf.ProxyBeforeTLS {
|
312
|
312
|
proxyLine = readRawProxyLine(conn)
|
313
|
313
|
if proxyLine == "" {
|
314
|
314
|
server.logger.Error("internal", "bad TLS-proxy line from", addr)
|
|
@@ -877,7 +877,7 @@ func (server *Server) loadDatastore(config *Config) error {
|
877
|
877
|
func (server *Server) setupListeners(config *Config) (err error) {
|
878
|
878
|
logListener := func(addr string, config listenerConfig) {
|
879
|
879
|
server.logger.Info("listeners",
|
880
|
|
- fmt.Sprintf("now listening on %s, tls=%t, tlsproxy=%t, tor=%t.", addr, (config.TLSConfig != nil), config.IsTLSProxy, config.IsTor),
|
|
880
|
+ fmt.Sprintf("now listening on %s, tls=%t, tlsproxy=%t, tor=%t.", addr, (config.TLSConfig != nil), config.ProxyBeforeTLS, config.Tor),
|
881
|
881
|
)
|
882
|
882
|
}
|
883
|
883
|
|
|
@@ -904,7 +904,7 @@ func (server *Server) setupListeners(config *Config) (err error) {
|
904
|
904
|
publicPlaintextListener := ""
|
905
|
905
|
// create new listeners that were not previously configured
|
906
|
906
|
for newAddr, newConfig := range config.Server.trueListeners {
|
907
|
|
- if strings.HasPrefix(newAddr, ":") && !newConfig.IsTor && !newConfig.IsSTSOnly && newConfig.TLSConfig == nil {
|
|
907
|
+ if strings.HasPrefix(newAddr, ":") && !newConfig.Tor && !newConfig.STSOnly && newConfig.TLSConfig == nil {
|
908
|
908
|
publicPlaintextListener = newAddr
|
909
|
909
|
}
|
910
|
910
|
_, exists := server.listeners[newAddr]
|