From ce7680022b8c3f8ccf6e8627dafddf4364dccb8e Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 20 Sep 2016 14:56:16 -0400 Subject: [PATCH] Force tls_disable on scada connection inside outer TLS connection as it's not currently supported anyways --- command/server/listener_atlas.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/command/server/listener_atlas.go b/command/server/listener_atlas.go index f23502bd1d..92f70e9bae 100644 --- a/command/server/listener_atlas.go +++ b/command/server/listener_atlas.go @@ -56,5 +56,9 @@ func atlasListenerFactory(config map[string]string, logger io.Writer) (net.Liste "infrastructure": scadaConfig.Atlas.Infrastructure, } + // The outer connection is already TLS-enabled; this is just the listener + // that reaches back inside that connection + config["tls_disable"] = "1" + return listenerWrapTLS(ln, props, config) }