diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-12-14 12:36:27 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-12-14 12:36:27 +0200 |
| commit | 468d575fc73881900f4a4cb1fa71c187d77429a7 (patch) | |
| tree | 05b00d7f00e04202c34de41e6feb566426e19e3f /doc/integration | |
| parent | 8f0cef0b6e5e950efdf3ebfe8f9f846095fff9d9 (diff) | |
| parent | 78f89f7ad900ec2f2993a70caa2eb5dbf9e2496f (diff) | |
| download | gitlab-ce-468d575fc73881900f4a4cb1fa71c187d77429a7.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/shibboleth.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index eb9bbb67e7d..696c1011eeb 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -2,7 +2,7 @@ This documentation is for enabling shibboleth with omnibus-gitlab package. -In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled NIGNX provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. +In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled Nginx provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. To enable the Shibboleth OmniAuth provider you must: |