diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-08-28 08:37:55 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-08-28 08:37:55 -0400 |
| commit | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (patch) | |
| tree | 176afd630a3afbe0ac3389695be6b4ce1c45d069 /docker/dev | |
| parent | db7e8c12889485234fb2d1ba6556106e5fc7548b (diff) | |
| download | chat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.tar.gz chat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.tar.bz2 chat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.zip | |
Added the ability to create a team with SSO services and added the ability to turn off email sign up.
Diffstat (limited to 'docker/dev')
| -rw-r--r-- | docker/dev/config_docker.json | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 0fa51cfd4..f566cea61 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -22,16 +22,27 @@ "AnalyticsUrl": "", "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/", - "AllowedLoginAttempts": 10 + "AllowedLoginAttempts": 10, + "AllowEmailSignUp": true }, "SSOSettings": { "gitlab": { "Allow": false, "Secret" : "", "Id": "", + "Scope": "", "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" + }, + "google": { + "Allow": false, + "Secret": "", + "Id": "", + "Scope": "email profile", + "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth", + "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token", + "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me" } }, "SqlSettings": { |