diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-02-04 17:31:11 -0300 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-02-04 17:31:11 -0300 |
commit | 88118515d0d23385dc856dd87f304ea4b19b4196 (patch) | |
tree | 1c290ee33832d9622ee0916d1a8f15c28f70df72 /config/config.json | |
parent | 44c19ee443831e0e94b5738ecb21a64ce7643247 (diff) | |
download | chat-88118515d0d23385dc856dd87f304ea4b19b4196.tar.gz chat-88118515d0d23385dc856dd87f304ea4b19b4196.tar.bz2 chat-88118515d0d23385dc856dd87f304ea4b19b4196.zip |
PLT-7: Fix and Add new loc strings
Diffstat (limited to 'config/config.json')
-rw-r--r-- | config/config.json | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/config/config.json b/config/config.json index 5ed05fecd..345e3ea56 100644 --- a/config/config.json +++ b/config/config.json @@ -5,19 +5,21 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": false, - "EnableOutgoingWebhooks": false, - "EnableCommands": false, - "EnableOnlyAdminIntegrations": true, - "EnablePostUsernameOverride": false, - "EnablePostIconOverride": false, + "EnableIncomingWebhooks": true, + "EnableOutgoingWebhooks": true, + "EnableCommands": true, + "EnableOnlyAdminIntegrations": false, + "EnablePostUsernameOverride": true, + "EnablePostIconOverride": true, "EnableTesting": false, "EnableDeveloper": false, "EnableSecurityFixAlert": true, "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -111,5 +113,28 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" + }, + "GoogleSettings": { + "Enable": false, + "Secret": "", + "Id": "", + "Scope": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + }, + "LdapSettings": { + "Enable": false, + "LdapServer": null, + "LdapPort": 389, + "BaseDN": null, + "BindUsername": null, + "BindPassword": null, + "FirstNameAttribute": null, + "LastNameAttribute": null, + "EmailAttribute": null, + "UsernameAttribute": null, + "IdAttribute": null, + "QueryTimeout": 60 } }
\ No newline at end of file |