Commit 20947044 authored by Mike Lewis's avatar Mike Lewis

Merge branch 'docs-dblessing-okta-style' into 'master'

Update Okta documentation to match style guide

See merge request gitlab-org/gitlab!25364
parents 6128a84a 0f9d4ea9
...@@ -42,21 +42,6 @@ Now that the Okta app is configured, it's time to enable it in GitLab. ...@@ -42,21 +42,6 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
## Configure GitLab ## Configure GitLab
1. On your GitLab server, open the configuration file:
**For Omnibus GitLab installations**
```shell
sudo editor /etc/gitlab/gitlab.rb
```
**For installations from source**
```shell
cd /home/git/gitlab
sudo -u git -H editor config/gitlab.yml
```
1. See [Initial OmniAuth Configuration](../../integration/omniauth.md#initial-omniauth-configuration) 1. See [Initial OmniAuth Configuration](../../integration/omniauth.md#initial-omniauth-configuration)
for initial settings. for initial settings.
...@@ -66,13 +51,19 @@ Now that the Okta app is configured, it's time to enable it in GitLab. ...@@ -66,13 +51,19 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
**For Omnibus GitLab installations** **For Omnibus GitLab installations**
Edit `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']
gitlab_rails['omniauth_block_auto_created_users'] = false gitlab_rails['omniauth_block_auto_created_users'] = false
``` ```
---
**For installations from source** **For installations from source**
Edit `config/gitlab.yml`:
```yaml ```yaml
allow_single_sign_on: ["saml"] allow_single_sign_on: ["saml"]
block_auto_created_users: false block_auto_created_users: false
...@@ -83,12 +74,18 @@ Now that the Okta app is configured, it's time to enable it in GitLab. ...@@ -83,12 +74,18 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
**For Omnibus GitLab installations** **For Omnibus GitLab installations**
Edit `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
gitlab_rails['omniauth_auto_link_saml_user'] = true gitlab_rails['omniauth_auto_link_saml_user'] = true
``` ```
---
**For installations from source** **For installations from source**
Edit `config/gitlab.yml`:
```yaml ```yaml
auto_link_saml_user: true auto_link_saml_user: true
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment