Commit e69b5f19 authored by Marin Jankovski's avatar Marin Jankovski

Place the settings that are valid for all ldap servers in a correct place.

parent 8a92a1bb
...@@ -3,8 +3,8 @@ class LdapSyncWorker ...@@ -3,8 +3,8 @@ class LdapSyncWorker
include Sidetiq::Schedulable include Sidetiq::Schedulable
if Gitlab.config.ldap.enabled if Gitlab.config.ldap.enabled
HOUR = Gitlab.config.ldap.servers.values.first['schedule_sync_hour'] HOUR = Gitlab.config.ldap.schedule_sync_hour
MINUTE = Gitlab.config.ldap.servers.values.first['schedule_sync_minute'] MINUTE = Gitlab.config.ldap.schedule_sync_minute
recurrence { daily.hour_of_day(HOUR).minute_of_hour(MINUTE) } recurrence { daily.hour_of_day(HOUR).minute_of_hour(MINUTE) }
end end
......
...@@ -135,6 +135,13 @@ production: &base ...@@ -135,6 +135,13 @@ production: &base
# bundle exec rake gitlab:ldap:check RAILS_ENV=production # bundle exec rake gitlab:ldap:check RAILS_ENV=production
ldap: ldap:
enabled: false enabled: false
# GitLab EE only.
# GitLab will refresh LDAP user membership once a day.
# Default time of the day when this will happen is at 1:30am server time.
schedule_sync_hour: 1 # Hour of the day. Value from 0-23.
schedule_sync_minute: 30 # Minute of the hour. Value from 0-59.
servers: servers:
main: # 'main' is the GitLab 'provider ID' of this LDAP server main: # 'main' is the GitLab 'provider ID' of this LDAP server
## label ## label
...@@ -210,11 +217,6 @@ production: &base ...@@ -210,11 +217,6 @@ production: &base
# #
sync_ssh_keys: false sync_ssh_keys: false
# GitLab will refresh LDAP user membership once a day.
# Default time of the day when this will happen is at 1:30am server time.
schedule_sync_hour: 1 # Hour of the day. Value from 0-23.
schedule_sync_minute: 30 # Minute of the hour. Value from 0-59.
# GitLab EE only: add more LDAP servers # GitLab EE only: add more LDAP servers
# Choose an ID made of a-z and 0-9 . This ID will be stored in the database # Choose an ID made of a-z and 0-9 . This ID will be stored in the database
# so that GitLab can remember which LDAP server a user belongs to. # so that GitLab can remember which LDAP server a user belongs to.
......
...@@ -56,6 +56,8 @@ end ...@@ -56,6 +56,8 @@ end
Settings['ldap'] ||= Settingslogic.new({}) Settings['ldap'] ||= Settingslogic.new({})
Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
Settings.ldap['sync_time'] = 3600 if Settings.ldap['sync_time'].nil? Settings.ldap['sync_time'] = 3600 if Settings.ldap['sync_time'].nil?
Settings.ldap['schedule_sync_hour'] = 1 if Settings.ldap['schedule_sync_hour'].nil?
Settings.ldap['schedule_sync_minute'] = 30 if Settings.ldap['schedule_sync_minute'].nil?
# backwards compatibility, we only have one host # backwards compatibility, we only have one host
if Settings.ldap['enabled'] || Rails.env.test? if Settings.ldap['enabled'] || Rails.env.test?
...@@ -77,8 +79,6 @@ if Settings.ldap['enabled'] || Rails.env.test? ...@@ -77,8 +79,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
server['provider_name'] ||= "ldap#{key}".downcase server['provider_name'] ||= "ldap#{key}".downcase
server['sync_time'] = 3600 if server['sync_time'].nil? server['sync_time'] = 3600 if server['sync_time'].nil?
server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name']) server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
server['schedule_sync_hour'] = 1 if server['schedule_sync_hour'].nil?
server['schedule_sync_minute'] = 30 if server['schedule_sync_minute'].nil?
Settings.ldap['servers'][key] = server Settings.ldap['servers'][key] = server
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment