diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-14 22:35:57 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-14 22:39:44 +0500 |
commit | e214aae719c10953c4c3a7949c9bd02d6983b045 (patch) | |
tree | de67fab11c5866493374d602930b4b5fbc98d05a /config | |
parent | bf7ae0711743926cfbb031675cc3320d7a942465 (diff) | |
download | chat-e214aae719c10953c4c3a7949c9bd02d6983b045.tar.gz chat-e214aae719c10953c4c3a7949c9bd02d6983b045.tar.bz2 chat-e214aae719c10953c4c3a7949c9bd02d6983b045.zip |
PLT-963 - Improving scss structure
Diffstat (limited to 'config')
-rw-r--r-- | config/config.json | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/config/config.json b/config/config.json index b211b16d3..7e8b42708 100644 --- a/config/config.json +++ b/config/config.json @@ -11,7 +11,7 @@ "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableTesting": false, + "EnableTesting": true, "EnableDeveloper": false, "EnableSecurityFixAlert": true, "EnableInsecureOutgoingConnections": false, @@ -19,7 +19,9 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -72,7 +74,7 @@ "EnableSignUpWithEmail": true, "EnableSignInWithEmail": true, "EnableSignInWithUsername": false, - "SendEmailNotifications": false, + "SendEmailNotifications": true, "RequireEmailVerification": false, "FeedbackName": "", "FeedbackEmail": "", @@ -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 |