diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-13 09:51:55 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-13 09:51:55 -0700 |
| commit | a2979924a430e9e9bb70d30653035af77ecb1ef2 (patch) | |
| tree | f721454bf9cc22e8a35a5c7e2d94a3ffe53816a0 /doc/install/Configuration-Settings.md | |
| parent | 1dbc6c5d0e760a1780a401f54503451d6a240192 (diff) | |
| parent | b2b641bb114c29f92eb41a4da2f5d612ec03643b (diff) | |
| download | chat-a2979924a430e9e9bb70d30653035af77ecb1ef2.tar.gz chat-a2979924a430e9e9bb70d30653035af77ecb1ef2.tar.bz2 chat-a2979924a430e9e9bb70d30653035af77ecb1ef2.zip | |
Merge pull request #1027 from mattermost/check-https
Updating SSO help on HTTP/HTTPS
Diffstat (limited to 'doc/install/Configuration-Settings.md')
| -rw-r--r-- | doc/install/Configuration-Settings.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 804a94c30..a92893753 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -257,19 +257,19 @@ Settings to configure account and team creation using GitLab OAuth. “true”: Allow team creation and account signup using GitLab OAuth. To configure, input the **Secret** and **Id** credentials. ```"Secret": ""``` -Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https://<your-mattermost-url>/login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https://<your-mattermost-url>/signup/gitlab/complete". ```"Id": ""``` -Obtain this value by logging into your GitLab account. Go to Applications -> Profile Settings. Enter Redirect URLs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https://<your-mattermost-url>/login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https://<your-mattermost-url>/signup/gitlab/complete". ```"AuthEndpoint": ""``` -Enter <your-gitlab-url>/oauth/authorize (example: http://localhost:3000/oauth/authorize). Use HTTP or HTTPS in your URLs as appropriate. +Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/oauth/authorize). Use HTTP or HTTPS depending on how your server is configured. ```"TokenEndpoint": ""``` -Enter <your-gitlab-url>/oauth/token (example: http://localhost:3000/oauth/token). Use HTTP or HTTPS in your URLs as appropriate. +Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/oauth/token). Use HTTP or HTTPS depending on how your server is configured. ```"UserApiEndpoint": ""``` -Enter <your-gitlab-url>/api/v3/user (example: http://localhost:3000/api/v3/user). Use HTTP or HTTPS in your URLs as appropriate. +Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/api/v3/user). Use HTTP or HTTPS depending on how your server is configured. ## Config.json Settings Not in System Console |