summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-08 12:41:26 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-08 12:41:26 -0600
commit3fba8e42b140c1189bf3c06882cce5e2231e63da (patch)
tree7a0721cecf6624fc9c1fd71449628472b941ddeb /config
parent001a4448ca5fb0018eeb442915b473b121c04bf3 (diff)
downloadchat-3fba8e42b140c1189bf3c06882cce5e2231e63da.tar.gz
chat-3fba8e42b140c1189bf3c06882cce5e2231e63da.tar.bz2
chat-3fba8e42b140c1189bf3c06882cce5e2231e63da.zip
partial fix for UI
Diffstat (limited to 'config')
-rw-r--r--config/config.json41
1 files changed, 33 insertions, 8 deletions
diff --git a/config/config.json b/config/config.json
index c43db1e50..b3822692e 100644
--- a/config/config.json
+++ b/config/config.json
@@ -5,17 +5,19 @@
"SegmentDeveloperKey": "",
"GoogleDeveloperKey": "",
"EnableOAuthServiceProvider": false,
- "EnableIncomingWebhooks": false,
- "EnableOutgoingWebhooks": false,
- "EnablePostUsernameOverride": false,
- "EnablePostIconOverride": false,
+ "EnableIncomingWebhooks": true,
+ "EnableOutgoingWebhooks": true,
+ "EnableCommands": true,
+ "EnableOnlyAdminIntegrations": true,
+ "EnablePostUsernameOverride": true,
+ "EnablePostIconOverride": true,
"EnableTesting": false,
"EnableDeveloper": false,
"EnableSecurityFixAlert": true,
- "SessionLengthWebInDays" : 30,
- "SessionLengthMobileInDays" : 30,
- "SessionLengthSSOInDays" : 30,
- "SessionCacheInMinutes" : 10
+ "SessionLengthWebInDays": 30,
+ "SessionLengthMobileInDays": 30,
+ "SessionLengthSSOInDays": 30,
+ "SessionCacheInMinutes": 10
},
"TeamSettings": {
"SiteName": "Mattermost",
@@ -107,5 +109,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