summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-08 07:34:39 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-08 07:34:39 -0500
commitbe70bbc2f027bcc32d54e03c6b66f7e3aadec425 (patch)
tree02cbf3694b44045422b46fdb90a4b272c1fad976 /docker
parent9b35fb5fa59099fe644a1b1ef3734b09b50f98bf (diff)
parent9f5f18a93a6db2b9c1089862fb68c2ee33e634ca (diff)
downloadchat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.gz
chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.bz2
chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.zip
Merge pull request #2083 from mattermost/plt-1879
PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix deleteā€¦
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json1
-rw-r--r--docker/local/config_docker.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index e831bbb3a..6a1290189 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -14,6 +14,7 @@
"EnableTesting": false,
"EnableDeveloper": false,
"EnableSecurityFixAlert": true,
+ "EnableInsecureOutgoingConnections": false,
"SessionLengthWebInDays" : 30,
"SessionLengthMobileInDays" : 30,
"SessionLengthSSOInDays" : 30,
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index e831bbb3a..6a1290189 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -14,6 +14,7 @@
"EnableTesting": false,
"EnableDeveloper": false,
"EnableSecurityFixAlert": true,
+ "EnableInsecureOutgoingConnections": false,
"SessionLengthWebInDays" : 30,
"SessionLengthMobileInDays" : 30,
"SessionLengthSSOInDays" : 30,