summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json13
-rw-r--r--docker/local/config_docker.json13
2 files changed, 24 insertions, 2 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": {
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 0fa51cfd4..f566cea61 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/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": {