Skip to content
Snippets Groups Projects
Unverified Commit 0f9d4ea9 authored by Drew Blessing's avatar Drew Blessing
Browse files

Update Okta documentation to match style guide

parent 10b04c00
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -42,21 +42,6 @@ Now that the Okta app is configured, it's time to enable it in 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)
for initial settings.
 
Loading
Loading
@@ -66,13 +51,19 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
 
**For Omnibus GitLab installations**
 
Edit `/etc/gitlab/gitlab.rb`:
```ruby
gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']
gitlab_rails['omniauth_block_auto_created_users'] = false
```
 
---
**For installations from source**
 
Edit `config/gitlab.yml`:
```yaml
allow_single_sign_on: ["saml"]
block_auto_created_users: false
Loading
Loading
@@ -83,15 +74,21 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
 
**For Omnibus GitLab installations**
 
Edit `/etc/gitlab/gitlab.rb`:
```ruby
gitlab_rails['omniauth_auto_link_saml_user'] = true
```
 
---
**For installations from source**
 
```yaml
auto_link_saml_user: true
```
Edit `config/gitlab.yml`:
```yaml
auto_link_saml_user: true
```
 
1. Add the provider configuration.
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment