diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-05 10:28:41 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-05 10:28:41 +0000 |
| commit | ea6e4bf0c2a73c9dda745f2b971079c1dbf2b645 (patch) | |
| tree | 9f428ec403907183f3e24ea4eb39ecdbc920a0d8 /doc/integration | |
| parent | 4e287630aa4152ce891b9ef6151ad8a8e1c42176 (diff) | |
| parent | 15eea9c7157b3c28037e983b80d3d1ac35cae96a (diff) | |
| download | gitlab-ce-ea6e4bf0c2a73c9dda745f2b971079c1dbf2b645.tar.gz | |
Merge branch 'mrchrisw/docs/shibboleth' into 'master'
Fix wording around NGINX Shibboleth setup
__________
See merge request !5034
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 b6b2d4e5e88..5210ce0de9a 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 I did not found way to easily configure Nginx that is bundled in 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 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. To enable the Shibboleth OmniAuth provider you must: |