From 02ea3d1021350311b282ef13e995c06a691c3e1f Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 24 Mar 2014 14:08:08 +0100 Subject: [PATCH] Reduce the difference with upstream gitlab.yml --- files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 7283445..53e8cc4 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -125,7 +125,6 @@ production: &base ldap: enabled: <%= @ldap_enabled %> host: '<%= @ldap_host %>' - base: '<%= @ldap_base %>' port: <%= @ldap_port %> uid: '<%= @ldap_uid %>' method: '<%= @ldap_method %>' # "tls" or "ssl" or "plain" @@ -142,6 +141,12 @@ production: &base # disable this setting, because the userPrincipalName contains an '@'. allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %> + # Base where we can search for users + # + # Ex. ou=People,dc=gitlab,dc=example + # + base: '<%= @ldap_base %>' + # Filter LDAP users # # Format: RFC 4515 @@ -234,6 +239,10 @@ production: &base ## Google analytics. Uncomment if you want it # google_analytics_id: '_your_tracking_id' + ## Piwik analytics. + # piwik_url: '_your_piwik_url' + # piwik_site_id: '_your_piwik_site_id' + ## Text under sign-in page (Markdown enabled) # sign_in_text: | # ![Company Logo](http://www.companydomain.com/logo.png) -- libgit2 0.21.2