diff options
author | Marin Jankovski <marin@gitlab.com> | 2016-05-12 17:12:48 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2016-05-12 17:12:48 +0300 |
commit | 9393d6b6f2332c0c369f7b05cb45ed639be99bda (patch) | |
tree | 22268e7ffaccc4e101f91ff25a4c93417baca82d /doc | |
parent | 624dc104a81293f4c3dae7746404868dff74d42f (diff) | |
parent | ff1e7474ed0f210df004c714e1b83c1c2eb0d91c (diff) |
Merge branch 'patch-2' into 'master'
Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run.
I spent a while trying to figure our why the cas wasn't working!
Someone may need to update the source code section of the wiki
See merge request !3850
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/cas.md | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/doc/integration/cas.md b/doc/integration/cas.md index e6b2071f193..e34e306f9ac 100644 --- a/doc/integration/cas.md +++ b/doc/integration/cas.md @@ -27,17 +27,18 @@ To enable the CAS OmniAuth provider you must register your application with your ```ruby gitlab_rails['omniauth_providers'] = [ { - name: "cas3", - label: "cas", - args: { - url: 'CAS_SERVER', - login_url: '/CAS_PATH/login', - service_validate_url: '/CAS_PATH/p3/serviceValidate', - logout_url: '/CAS_PATH/logout'} } - } + "name"=> "cas3", + "label"=> "cas", + "args"=> { + "url"=> 'CAS_SERVER', + "login_url"=> '/CAS_PATH/login', + "service_validate_url"=> '/CAS_PATH/p3/serviceValidate', + "logout_url"=> '/CAS_PATH/logout' + } } ] ``` + For installations from source: @@ -57,6 +58,8 @@ To enable the CAS OmniAuth provider you must register your application with your 1. Save the configuration file. +1. Run `gitlab-ctl reconfigure` for the omnibus package. + 1. Restart GitLab for the changes to take effect. On the sign in page there should now be a CAS tab in the sign in form. |