diff options
author | =Corey Hulen <corey@hulen.com> | 2016-03-14 16:07:58 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-03-15 18:27:45 -0700 |
commit | 36b17bf99ddd35c0c223722f8b6f4f1c71b2235e (patch) | |
tree | 6bc07d42d19d1d7a5bef26864bb93a1bc91da5f1 /config | |
parent | ea3f25924ea64a2dd1e73624c0d30824e1efb240 (diff) | |
download | chat-36b17bf99ddd35c0c223722f8b6f4f1c71b2235e.tar.gz chat-36b17bf99ddd35c0c223722f8b6f4f1c71b2235e.tar.bz2 chat-36b17bf99ddd35c0c223722f8b6f4f1c71b2235e.zip |
PLT-2115 Adding compliance
Diffstat (limited to 'config')
-rw-r--r-- | config/config.json | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index b211b16d3..5ed5d61bc 100644 --- a/config/config.json +++ b/config/config.json @@ -19,7 +19,9 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -113,5 +115,33 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" + }, + "GoogleSettings": { + "Enable": false, + "Secret": "", + "Id": "", + "Scope": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + }, + "LdapSettings": { + "Enable": false, + "LdapServer": "", + "LdapPort": 389, + "BaseDN": "", + "BindUsername": "", + "BindPassword": "", + "FirstNameAttribute": "", + "LastNameAttribute": "", + "EmailAttribute": "", + "UsernameAttribute": "", + "IdAttribute": "", + "QueryTimeout": 60 + }, + "ComplianceSettings": { + "Enable": true, + "Directory": "./data/", + "EnableDaily": false } -} +}
\ No newline at end of file |