diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-01-14 08:24:47 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-01-14 08:24:47 -0500 |
| commit | 7d383319df2adf578eb4b2b29555846a7c848049 (patch) | |
| tree | d8283b12c2a1b14c18da4ae446f5c2ca0e5d0af5 /config | |
| parent | 53b0cd8f2a24798c67505aa447b1d53b9f14197e (diff) | |
| parent | c26edcf6786fd8aa1535c09e9581fc6417cddda4 (diff) | |
| download | chat-7d383319df2adf578eb4b2b29555846a7c848049.tar.gz chat-7d383319df2adf578eb4b2b29555846a7c848049.tar.bz2 chat-7d383319df2adf578eb4b2b29555846a7c848049.zip | |
Merge pull request #1887 from mattermost/editions
Editions
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/config/config.json b/config/config.json index 076f795cc..907b66828 100644 --- a/config/config.json +++ b/config/config.json @@ -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 |