CE-EE parity for files in config/initializers
This commit is contained in:
parent
9f677359a7
commit
3d12f07331
|
@ -76,6 +76,7 @@ Gitlab.ee do
|
|||
Settings['smartcard'] ||= Settingslogic.new({})
|
||||
Settings.smartcard['enabled'] = false if Settings.smartcard['enabled'].nil?
|
||||
Settings.smartcard['client_certificate_required_port'] = 3444 if Settings.smartcard['client_certificate_required_port'].nil?
|
||||
Settings.smartcard['required_for_git_access'] = false if Settings.smartcard['required_for_git_access'].nil?
|
||||
end
|
||||
|
||||
Settings['omniauth'] ||= Settingslogic.new({})
|
||||
|
|
|
@ -2,9 +2,18 @@
|
|||
if defined?(Rails::Console)
|
||||
# note that this will not print out when using `spring`
|
||||
justify = 15
|
||||
puts "-------------------------------------------------------------------------------------"
|
||||
|
||||
puts '-' * 80
|
||||
puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})"
|
||||
puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
|
||||
puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
|
||||
puts "-------------------------------------------------------------------------------------"
|
||||
|
||||
Gitlab.ee do
|
||||
if Gitlab::Geo.enabled?
|
||||
puts " Geo enabled:".ljust(justify) + 'yes'
|
||||
puts " Geo server:".ljust(justify) + EE::GeoHelper.current_node_human_status
|
||||
end
|
||||
end
|
||||
|
||||
puts '-' * 80
|
||||
end
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
HealthCheck.setup do |config|
|
||||
config.standard_checks = %w(database migrations cache)
|
||||
config.full_checks = %w(database migrations cache)
|
||||
|
||||
Gitlab.ee do
|
||||
config.add_custom_check('geo') do
|
||||
Gitlab::Geo::HealthCheck.new.perform_checks
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -85,6 +85,19 @@ Sidekiq.configure_server do |config|
|
|||
ActiveRecord::Base.establish_connection(db_config)
|
||||
Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}")
|
||||
|
||||
Gitlab.ee do
|
||||
Gitlab::Mirror.configure_cron_job!
|
||||
|
||||
Gitlab::Geo.configure_cron_jobs!
|
||||
|
||||
if Gitlab::Geo.geo_database_configured?
|
||||
Rails.configuration.geo_database['pool'] = Sidekiq.options[:concurrency]
|
||||
Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
|
||||
|
||||
Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{Geo::TrackingBase.connection_pool.size} (Geo tracking database)")
|
||||
end
|
||||
end
|
||||
|
||||
# Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
|
||||
# https://github.com/mikel/mail/issues/912#issuecomment-214850355
|
||||
Mail.eager_autoload!
|
||||
|
|
Loading…
Reference in New Issue