diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-11 09:12:51 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-11 09:12:51 -0600 |
| commit | b1251b93932adf616a996725448d0b77fad0d3c1 (patch) | |
| tree | 4c5482d77364e660faeed3da8bc21e305c1b749f /config | |
| parent | 01d6a48419d351f92c40f8ed9352fa203cc46e4a (diff) | |
| download | chat-b1251b93932adf616a996725448d0b77fad0d3c1.tar.gz chat-b1251b93932adf616a996725448d0b77fad0d3c1.tar.bz2 chat-b1251b93932adf616a996725448d0b77fad0d3c1.zip | |
Upgrade logging package
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/config/config.json b/config/config.json index c43db1e50..907b66828 100644 --- a/config/config.json +++ b/config/config.json @@ -12,10 +12,10 @@ "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 +107,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 |