diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-09 20:35:40 +0500 |
|---|---|---|
| committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-09 20:35:40 +0500 |
| commit | fe0aeac6fe2aaa6a9c33bd47a293d626c9d640e9 (patch) | |
| tree | 6effcbf552c6da1344c288e37aa1a01ab3f86e03 /config/config.json | |
| parent | 8e1c9c371b9fbfbc15d96d6f5c4092968dc41f43 (diff) | |
| download | chat-fe0aeac6fe2aaa6a9c33bd47a293d626c9d640e9.tar.gz chat-fe0aeac6fe2aaa6a9c33bd47a293d626c9d640e9.tar.bz2 chat-fe0aeac6fe2aaa6a9c33bd47a293d626c9d640e9.zip | |
Multiple UI Improvements
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/config/config.json b/config/config.json index 2795546f8..fe47adf6a 100644 --- a/config/config.json +++ b/config/config.json @@ -6,8 +6,8 @@ "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, "EnableIncomingWebhooks": false, - "EnableOutgoingWebhooks": false, - "EnableCommands": false, + "EnableOutgoingWebhooks": true, + "EnableCommands": true, "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, @@ -18,7 +18,9 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -112,5 +114,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 |