From 75d9a3a3b99d0acafb6783a721a35ab1ccdd8d9d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 20 Feb 2018 12:49:45 -0800 Subject: MM-8681 Adding config settings necessary for using CloudFront. (#8307) * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. --- config/default.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') 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, -- cgit v1.2.3-1-g7c22 From 5fb4b1bc935bd273990779e1d4a680a563784df8 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 23 Feb 2018 10:55:02 -0500 Subject: MM-8593 Default APIv3 to disabled for new installs (#8353) * Default APIv3 to disabled for new installs * Add EnableAPIv3 setting to client config * Enable APIv3 for needed tests --- config/default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/default.json b/config/default.json index 52413215e..cd170adef 100644 --- a/config/default.json +++ b/config/default.json @@ -22,7 +22,7 @@ "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableAPIv3": true, + "EnableAPIv3": false, "EnableLinkPreviews": false, "EnableTesting": false, "EnableDeveloper": false, -- cgit v1.2.3-1-g7c22