diff options
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/0_license.rb | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 11 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 4 | ||||
| -rw-r--r-- | config/initializers/forbid_sidekiq_in_transactions.rb | 2 | ||||
| -rw-r--r-- | config/initializers/lograge.rb | 7 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 | ||||
| -rw-r--r-- | config/initializers/static_files.rb | 6 |
7 files changed, 29 insertions, 8 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index e7b46a14630..ce3103be2e4 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true Gitlab.ee do - public_key_file = File.read(Rails.root.join(".license_encryption_key.pub")) + prefix = ENV['GITLAB_LICENSE_MODE'] == 'test' ? 'test_' : '' + public_key_file = File.read(Rails.root.join(".#{prefix}license_encryption_key.pub")) public_key = OpenSSL::PKey::RSA.new(public_key_file) Gitlab::License.encryption_key = public_key rescue diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 15c9fd427ff..79052e2b1dd 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -297,6 +297,10 @@ Settings.pages['external_http'] ||= false unless Settings.pages['external_http'] Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present? Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil? Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_secret') +# We want pages zip archives to be stored on the same directory as old pages hierarchical structure +# this will allow us to easier migrate existing instances with NFS +Settings.pages['storage_path'] = Settings.pages['path'] +Settings.pages['object_store'] = ObjectStoreSettings.legacy_parse(Settings.pages['object_store']) # # Geo @@ -520,8 +524,14 @@ Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['job_class'] = 'CiP Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker']['cron'] ||= '50 23 */1 * *' Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker']['job_class'] ||= 'Analytics::InstanceStatistics::CountJobTriggerWorker' +Settings.cron_jobs['member_invitation_reminder_emails_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['member_invitation_reminder_emails_worker']['cron'] ||= '0 0 * * *' +Settings.cron_jobs['member_invitation_reminder_emails_worker']['job_class'] = 'MemberInvitationReminderEmailsWorker' Gitlab.ee do + Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *' + Settings.cron_jobs['active_user_count_threshold_worker']['job_class'] = 'ActiveUserCountThresholdWorker' Settings.cron_jobs['adjourned_group_deletion_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['adjourned_group_deletion_worker']['cron'] ||= '0 3 * * *' Settings.cron_jobs['adjourned_group_deletion_worker']['job_class'] = 'AdjournedGroupDeletionWorker' @@ -727,6 +737,7 @@ Gitlab.ee do Settings['kerberos'] ||= Settingslogic.new({}) Settings.kerberos['enabled'] = false if Settings.kerberos['enabled'].nil? Settings.kerberos['keytab'] = nil if Settings.kerberos['keytab'].blank? # nil means use default keytab + Settings.kerberos['simple_ldap_linking_allowed_realms'] = [] if Settings.kerberos['simple_ldap_linking_allowed_realms'].blank? Settings.kerberos['service_principal_name'] = nil if Settings.kerberos['service_principal_name'].blank? # nil means any SPN in keytab Settings.kerberos['use_dedicated_port'] = false if Settings.kerberos['use_dedicated_port'].nil? Settings.kerberos['https'] = Settings.gitlab.https if Settings.kerberos['https'].nil? diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index d5d8587f1c8..dbaebc83658 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -69,7 +69,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Metrics.gauge(:deployments, 'GitLab Version', {}, :max).set({ version: Gitlab::VERSION }, 1) - Gitlab::Metrics::RequestsRackMiddleware.initialize_http_request_duration_seconds + unless Gitlab::Runtime.sidekiq? + Gitlab::Metrics::RequestsRackMiddleware.initialize_http_request_duration_seconds + end rescue IOError => e Gitlab::ErrorTracking.track_exception(e) Gitlab::Metrics.error_detected! diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb index 6bcd4dbd52f..f505fb5843a 100644 --- a/config/initializers/forbid_sidekiq_in_transactions.rb +++ b/config/initializers/forbid_sidekiq_in_transactions.rb @@ -46,7 +46,7 @@ end module ActiveRecord class Base module SkipTransactionCheckAfterCommit - def committed!(*) + def committed!(*args, **kwargs) Sidekiq::Worker.skipping_transaction_check { super } end end diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index e3601a9538e..74b6218bf53 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -17,6 +17,13 @@ unless Gitlab::Runtime.sidekiq? data[:duration_s] = Gitlab::Utils.ms_to_round_sec(data.delete(:duration)) if data[:duration] data.merge!(::Gitlab::Metrics::Subscribers::ActiveRecord.db_counter_payload) + # Remove empty hashes to prevent type mismatches + # These are set to empty hashes in Lograge's ActionCable subscriber + # https://github.com/roidrage/lograge/blob/v0.11.2/lib/lograge/log_subscribers/action_cable.rb#L14-L16 + %i(method path format).each do |key| + data[key] = nil if data[key] == {} + end + data end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index a33c28090e2..72e2b94fe07 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -3,13 +3,13 @@ def enable_reliable_fetch? return true unless Feature::FlipperFeature.table_exists? - Feature.enabled?(:gitlab_sidekiq_reliable_fetcher, default_enabled: true) + Feature.enabled?(:gitlab_sidekiq_reliable_fetcher, type: :ops, default_enabled: true) end def enable_semi_reliable_fetch_mode? return true unless Feature::FlipperFeature.table_exists? - Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, default_enabled: true) + Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, type: :ops, default_enabled: true) end # Custom Queues configuration diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb index e02f0868e9f..b8e555d4f5e 100644 --- a/config/initializers/static_files.rb +++ b/config/initializers/static_files.rb @@ -21,16 +21,16 @@ if app.config.public_file_server.enabled settings = { enabled: true, host: dev_server.host, - port: dev_server.port, manifest_host: dev_server.host, - manifest_port: dev_server.port + manifest_port: dev_server.port, + port: dev_server.port } if Rails.env.development? settings.merge!( host: Gitlab.config.gitlab.host, port: Gitlab.config.gitlab.port, - https: false + https: Gitlab.config.gitlab.https ) app.config.middleware.insert_before( Gitlab::Middleware::Static, |