diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
| commit | 75af5d4536cc414d171c2fe6dca78e455eb18b37 (patch) | |
| tree | 4e00cf97b5f4f570b1901093bfa4e208749932a0 /docker/dev | |
| parent | d107b392a6309a41eac6cd7d07d720a21968eb56 (diff) | |
| parent | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (diff) | |
| download | chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.gz chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.bz2 chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.zip | |
Merge pull request #496 from mattermost/mm-2015
MM-2015 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": { |