summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-15 12:48:50 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-22 08:41:53 -0400
commitc39e95c7cb1ad6e812aa3ce4000b4dfdf214e77e (patch)
tree78075f919a9efd78ad845c6b0f50511a0a826e43 /config
parent2fef71da693b5afcc31ccad6be8790da8a70817f (diff)
downloadchat-c39e95c7cb1ad6e812aa3ce4000b4dfdf214e77e.tar.gz
chat-c39e95c7cb1ad6e812aa3ce4000b4dfdf214e77e.tar.bz2
chat-c39e95c7cb1ad6e812aa3ce4000b4dfdf214e77e.zip
inital implementation of using GitLab OAuth2 provider for signup/login
Diffstat (limited to 'config')
-rw-r--r--config/config.json6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.json b/config/config.json
index 085dd6de6..61183948f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -23,6 +23,12 @@
"UseLocalStorage": true,
"StorageDirectory": "./data/"
},
+ "SSOSettings": {
+ "AllowGitLabSSO": true,
+ "GitLabSecret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429",
+ "GitLabId": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008",
+ "GitLabUrl": "http://dockerhost:8080"
+ },
"SqlSettings": {
"DriverName": "mysql",
"DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test",