Enable omniauth setting in gitlab.yml

Jacob Vosmaer
1 parent 2dee7e19
Showing 3 changed files with 30 additions and 3 deletions Show diff stats
README.md
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -328,6 +328,26 @@ gitlab_rails[&#39;smtp_authentication&#39;] = &quot;login&quot;
 gitlab_rails['smtp_enable_starttls_auto'] = true
 ```
+### Omniauth (Google, Twitter, GitHub login)
+
+Omniauth configuration is documented on
+[doc.gitlab.com](http://doc.gitlab.com/ce/integration/omniauth.html). To effect
+the necessary changes in `gitlab.yml`, use the following syntax in
+`/etc/gitlab/gitlab.rb`. Note that the providers are specified as an array of
+Ruby hashes.
+
+```ruby
+gitlab_rails['omniauth_enabled'] = true
+gitlab_rails['omniauth_providers'] = [
+  {
+    "name" => "google_oauth2",
+    "app_id" => "YOUR APP ID",
+    "app_secret" => "YOUR APP SECRET",
+    "args" => { "access_type" => "offline", "approval_prompt" => "" }
+  }
+]
+```
+
 ## Backups
 ### Creating an application backup
@@ -90,6 +90,10 @@ default[&#39;gitlab&#39;][&#39;gitlab-rails&#39;][&#39;ldap_password&#39;] = nil
 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil
 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil
 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil
+default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
+default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
+default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
+default['gitlab']['gitlab-rails']['omniauth_providers'] = []
 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
 default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
@@ -167,14 +167,14 @@ production: &amp;base
   ## OmniAuth settings
   omniauth:
     # Allow login via Twitter, Google, etc. using OmniAuth providers
-    enabled: false
+    enabled: <%= @omniauth_enabled %>
     # CAUTION!
     # This allows users to login without having a user account first (default: false).
     # User accounts will be created automatically when authentication was successful.
-    allow_single_sign_on: false
+    allow_single_sign_on: <%= @omniauth_allow_single_sign_on %>
     # Locks down those users until they have been cleared by the admin (default: true).
-    block_auto_created_users: true
+    block_auto_created_users: <%= @omniauth_block_auto_created_users %>
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
@@ -192,6 +192,9 @@ production: &amp;base
       # - { name: 'github', app_id: 'YOUR APP ID',
       #     app_secret: 'YOUR APP SECRET',
       #     args: { scope: 'user:email' } }
+<% @omniauth_providers.each do |provider| %>
+      - <%= provider.to_json %>
+<% end %>
	@@ -328,6 +328,26 @@ gitlab_rails['smtp_authentication'] = "login"		@@ -328,6 +328,26 @@ gitlab_rails['smtp_authentication'] = "login"
328	gitlab_rails['smtp_enable_starttls_auto'] = true	328	gitlab_rails['smtp_enable_starttls_auto'] = true
329	```	329	```
330		330
		331	+### Omniauth (Google, Twitter, GitHub login)
		332	+
		333	+Omniauth configuration is documented on
		334	+[doc.gitlab.com](http://doc.gitlab.com/ce/integration/omniauth.html). To effect
		335	+the necessary changes in `gitlab.yml`, use the following syntax in
		336	+`/etc/gitlab/gitlab.rb`. Note that the providers are specified as an array of
		337	+Ruby hashes.
		338	+
		339	+```ruby
		340	+gitlab_rails['omniauth_enabled'] = true
		341	+gitlab_rails['omniauth_providers'] = [
		342	+ {
		343	+ "name" => "google_oauth2",
		344	+ "app_id" => "YOUR APP ID",
		345	+ "app_secret" => "YOUR APP SECRET",
		346	+ "args" => { "access_type" => "offline", "approval_prompt" => "" }
		347	+ }
		348	+]
		349	+```
		350	+
331	## Backups	351	## Backups
332		352
333	### Creating an application backup	353	### Creating an application backup