diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:14:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:14:39 +0300 |
| commit | 1eb82b65c554f21d83447f895a6208905fabe112 (patch) | |
| tree | ab12f01b3dc46f11c02afea1e470a78f06ca70c2 /doc/integration | |
| parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) | |
Add latest changes from gitlab-org/gitlab@12-3-auto-deploy-20190916stable-branch-foss-test
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/shibboleth.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 1b4e75e0ca1..ca5a8077e73 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -1,8 +1,6 @@ # Shibboleth OmniAuth Provider -NOTE: **Note:** -The preferred approach for integrating a Shibboleth authentication system -with Gitlab 10 or newer is to use [GitLab's SAML integration](saml.md). This documentation is for Omnibus GitLab 9.x installs or older. +This documentation is for enabling Shibboleth with the 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 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. |