gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'global_ldap_sync_time' into 'master' 

Add ldap_sync_time global configuration as the EE is still supporting it.

Related gitlab-org/gitlab-ee#364 and gitlab-org/omnibus-gitlab#1161

See merge request !679
This commit is contained in:
Drew Blessing 2016-03-09 19:22:54 +00:00
parent 2e107183fe 377583389a
commit 3a58bfda80
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
View File

@ -191,6 +191,7 @@ production: &base
# bundle exec rake gitlab:ldap:check RAILS_ENV=production
ldap:
enabled: <%= @ldap_enabled %>
sync_time: <%= @ldap_sync_time %>
<% if @ldap_servers.any? %>
servers:
<% @ldap_servers.each do |provider_id, settings| %>