Download as
Browse Code »

Commit 02ea3d1021350311b282ef13e995c06a691c3e1f

Authored by Jacob Vosmaer
1 parent 957a95e2
Exists in master and in 15 other branches 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

Reduce the difference with upstream gitlab.yml

Showing 1 changed file with 10 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @02ea3d1
... ... @@ -125,7 +125,6 @@ production: &base
125 125 ldap:
126 126 enabled: <%= @ldap_enabled %>
127 127 host: '<%= @ldap_host %>'
128   - base: '<%= @ldap_base %>'
129 128 port: <%= @ldap_port %>
130 129 uid: '<%= @ldap_uid %>'
131 130 method: '<%= @ldap_method %>' # "tls" or "ssl" or "plain"
... ... @@ -142,6 +141,12 @@ production: &amp;base
142 141 # disable this setting, because the userPrincipalName contains an '@'.
143 142 allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %>
144 143  
  144 + # Base where we can search for users
  145 + #
  146 + # Ex. ou=People,dc=gitlab,dc=example
  147 + #
  148 + base: '<%= @ldap_base %>'
  149 +
145 150 # Filter LDAP users
146 151 #
147 152 # Format: RFC 4515
... ... @@ -234,6 +239,10 @@ production: &amp;base
234 239 ## Google analytics. Uncomment if you want it
235 240 # google_analytics_id: '_your_tracking_id'
236 241  
  242 + ## Piwik analytics.
  243 + # piwik_url: '_your_piwik_url'
  244 + # piwik_site_id: '_your_piwik_site_id'
  245 +
237 246 ## Text under sign-in page (Markdown enabled)
238 247 # sign_in_text: |
239 248 # ![Company Logo](http://www.companydomain.com/logo.png)
... ...