diff options
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 11 |
1 files changed, 11 insertions, 0 deletions
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? |