summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-02-20 12:49:45 -0800
committerGitHub <noreply@github.com>2018-02-20 12:49:45 -0800
commit75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d (patch)
treee362a6a112af73c8b5d9c7739753751429903a26 /config
parentfebc129ecaa2a0ca8c6f8deeac654cb296b2b436 (diff)
downloadchat-75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d.tar.gz
chat-75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d.tar.bz2
chat-75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d.zip
MM-8681 Adding config settings necessary for using CloudFront. (#8307)
* Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics.
Diffstat (limited to 'config')
-rw-r--r--config/default.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json
index 934635cb9..52413215e 100644
--- a/config/default.json
+++ b/config/default.json
@@ -1,6 +1,7 @@
{
"ServiceSettings": {
"SiteURL": "http://localhost:8065",
+ "WebsocketURL": "",
"LicenseFileLocation": "",
"ListenAddress": ":8065",
"ConnectionSecurity": "",
@@ -32,6 +33,7 @@
"EnforceMultifactorAuthentication": false,
"EnableUserAccessTokens": false,
"AllowCorsFrom": "",
+ "AllowCookiesForSubdomains": false,
"SessionLengthWebInDays": 30,
"SessionLengthMobileInDays": 30,
"SessionLengthSSOInDays": 30,