diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-14 08:50:46 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:02:55 -0400 |
| commit | 12896bd23eeba79884245c1c29fdc568cf21a7fa (patch) | |
| tree | 4e7f83d3e2564b9b89d669e9f7905ff11768b11a /config | |
| parent | 29fe6a3d13c9c7aa490fffebbe5d1b5fdf1e3090 (diff) | |
| download | chat-12896bd23eeba79884245c1c29fdc568cf21a7fa.tar.gz chat-12896bd23eeba79884245c1c29fdc568cf21a7fa.tar.bz2 chat-12896bd23eeba79884245c1c29fdc568cf21a7fa.zip | |
Converting to Webpack. Stage 1.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index b211b16d3..57f455b32 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,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 |