summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-02-03 12:16:28 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-02-03 12:17:13 -0300
commitcdfa9b585a220353114924477a300fb6d3e50df8 (patch)
treee4831292bb2d6f762a7fbb00a9e814dd61f29ff6 /config/config.json
parent6a3806fe9d03abdfa1eb30fc62c7388a6922b60f (diff)
downloadchat-cdfa9b585a220353114924477a300fb6d3e50df8.tar.gz
chat-cdfa9b585a220353114924477a300fb6d3e50df8.tar.bz2
chat-cdfa9b585a220353114924477a300fb6d3e50df8.zip
Messages for SocketStore and small fixes
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json27
1 files changed, 26 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index 560073ad2..ff3a27292 100644
--- a/config/config.json
+++ b/config/config.json
@@ -15,7 +15,9 @@
"SessionLengthWebInDays": 30,
"SessionLengthMobileInDays": 30,
"SessionLengthSSOInDays": 30,
- "SessionCacheInMinutes": 10
+ "SessionCacheInMinutes": 10,
+ "WebsocketSecurePort": 443,
+ "WebsocketPort": 80
},
"TeamSettings": {
"SiteName": "Mattermost",
@@ -109,5 +111,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