summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-22 16:27:08 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-22 16:27:08 -0400
commitfabdc9a32661fd0410560ca918f5302249f9cfad (patch)
treeeaac46b87bc8198b98686e9bba728ca908008069 /config
parentdd970604d1790aa8b35a42862bace300c601f325 (diff)
downloadchat-fabdc9a32661fd0410560ca918f5302249f9cfad.tar.gz
chat-fabdc9a32661fd0410560ca918f5302249f9cfad.tar.bz2
chat-fabdc9a32661fd0410560ca918f5302249f9cfad.zip
added SSOSettings to docker config file
Diffstat (limited to 'config')
-rw-r--r--config/config_docker.json10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/config_docker.json b/config/config_docker.json
index 062cdef65..a9ed98f1a 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -23,6 +23,16 @@
"UseLocalStorage": true,
"StorageDirectory": "/mattermost/data/"
},
+ "SSOSettings": {
+ "gitlab": {
+ "Allow": false,
+ "Secret" : "",
+ "Id": "",
+ "AuthEndpoint": "",
+ "TokenEndpoint": "",
+ "UserApiEndpoint": ""
+ }
+ },
"SqlSettings": {
"DriverName": "mysql",
"DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test",