Download as
Browse Code »

Commit caf12ffd96a22d5cb123c4193478e1cc5c4fb770

Authored by Jacob Vosmaer
1 parent 092e81e5
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Remove omniauth from gitlab-rails attributes 

We should add it back later
Showing 1 changed file with 0 additions and 4 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @caf12ff
@@ -86,10 +86,6 @@ default['gitlab']['gitlab-rails']['ldap_method'] = "ssl" @@ -86,10 +86,6 @@ default['gitlab']['gitlab-rails']['ldap_method'] = "ssl"
86 default['gitlab']['gitlab-rails']['ldap_bind_dn'] = "_the_full_dn_of_the_user_you_will_bind_with" 86 default['gitlab']['gitlab-rails']['ldap_bind_dn'] = "_the_full_dn_of_the_user_you_will_bind_with"
87 default['gitlab']['gitlab-rails']['ldap_password'] = "_the_password_of_the_bind_user" 87 default['gitlab']['gitlab-rails']['ldap_password'] = "_the_password_of_the_bind_user"
88 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = true 88 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = true
89 -default['gitlab']['gitlab-rails']['omniauth_enabled'] = false  
90 -default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = false  
91 -default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = true  
92 -default['gitlab']['gitlab-rails']['omniauth_providers'] =  
93 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/gitlab-satellites" 89 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/gitlab-satellites"
94 default['gitlab']['gitlab-rails']['backup_path'] = "tmp/backups" 90 default['gitlab']['gitlab-rails']['backup_path'] = "tmp/backups"
95 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/home/git/gitlab-shell/" 91 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/home/git/gitlab-shell/"