diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-05 13:34:25 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-05 13:34:25 +0200 |
| commit | 3f59a8f0be101c2405372d05a304540beb1b6d01 (patch) | |
| tree | 60db46574ab7f6c238ac8b0bd1a9ee5eee31628b /config | |
| parent | 214f38c4223091ce37d41582feacae09120db5d9 (diff) | |
| parent | 45e9150a517970d3782bed642b091ad60a46634f (diff) | |
| download | gitlab-ce-3f59a8f0be101c2405372d05a304540beb1b6d01.tar.gz | |
Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c7f22b9388b..787b3ccfc56 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -192,6 +192,9 @@ production: &base allow_single_sign_on: false # Locks down those users until they have been cleared by the admin (default: true). block_auto_created_users: true + # Look up new users in LDAP servers. If a match is found (same uid), automatically + # link the omniauth identity with the LDAP account. (default: false) + auto_link_ldap_user: false ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c234bd69e9a..1bd14a3a89f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -88,6 +88,9 @@ end Settings['omniauth'] ||= Settingslogic.new({}) Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil? +Settings.omniauth['allow_single_sign_on'] = false if Settings.omniauth['allow_single_sign_on'].nil? +Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block_auto_created_users'].nil? +Settings.omniauth['auto_link_ldap_user'] = false if Settings.omniauth['auto_link_ldap_user'].nil? Settings.omniauth['providers'] ||= [] |