diff options
| author | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
| commit | 901acc9703ae58b625b44e7abfd02333b9bab951 (patch) | |
| tree | 1a8fc17a85544bc7b8064874923e2fe6e3f44354 /config | |
| parent | 21afaf4bedcad578d4f876bb315d1072ccd296e6 (diff) | |
| parent | 2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff) | |
| download | chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.gz chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.bz2 chat-901acc9703ae58b625b44e7abfd02333b9bab951.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index 0fa8f235f..82b5fc57d 100644 --- a/config/default.json +++ b/config/default.json @@ -1,6 +1,7 @@ { "ServiceSettings": { "SiteURL": "http://localhost:8065", + "WebsocketURL": "", "LicenseFileLocation": "", "ListenAddress": ":8065", "ConnectionSecurity": "", @@ -21,7 +22,7 @@ "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableAPIv3": true, + "EnableAPIv3": false, "EnableLinkPreviews": false, "EnableTesting": false, "EnableDeveloper": false, @@ -32,6 +33,7 @@ "EnforceMultifactorAuthentication": false, "EnableUserAccessTokens": false, "AllowCorsFrom": "", + "AllowCookiesForSubdomains": false, "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, |