diff options
author | Ewan Edwards <eedwards@perforce.com> | 2015-02-03 15:18:40 -0800 |
---|---|---|
committer | Ewan Edwards <eedwards@perforce.com> | 2015-02-03 15:18:40 -0800 |
commit | ad6c372eeee5d112ad199dd4e487df584976445d (patch) | |
tree | 802124a688c9d90861c033a23342512008a56665 /doc/integration/shibboleth.md | |
parent | e6e337088bbb4736983119928b6b6b451bd3ef20 (diff) | |
download | gitlab-ce-ad6c372eeee5d112ad199dd4e487df584976445d.tar.gz |
Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
Diffstat (limited to 'doc/integration/shibboleth.md')
-rw-r--r-- | doc/integration/shibboleth.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 1b03197b6c7..ea11f1afeab 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -2,7 +2,7 @@ This documentation is for enabling shibboleth with gitlab-omnibus 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 gitlab-omnibus 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 I did not found way to easily configure Nginx that is bundled in gitlab-omnibus 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: @@ -10,7 +10,7 @@ To enable the Shibboleth OmniAuth provider you must: 1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document. Check https://wiki.shibboleth.net/ for more info. -1. You can find Apache config in gitlab-reciepes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf) +1. You can find Apache config in gitlab-recipes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf) Following changes are needed to enable shibboleth: @@ -34,7 +34,7 @@ protect omniauth-shibboleth callback URL: ``` exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this: ``` - #apache equivalent of nginx try files + # Apache equivalent of Nginx try files RewriteEngine on RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_URI} !/Shibboleth.sso @@ -50,7 +50,7 @@ File it should look like this: external_url 'https://gitlab.example.com' gitlab_rails['internal_api_url'] = 'https://gitlab.example.com' -# disable nginx +# disable Nginx nginx['enable'] = false gitlab_rails['omniauth_allow_single_sign_on'] = true |