Refs #29991 - Move settings into initializers

theforeman · Sep 10, 2024 · fbbf6c6 · fbbf6c6
1 parent 059506f
commit fbbf6c6
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 25 deletions.
diff --git a/app/registries/foreman/settings.rb b/app/registries/foreman/settings.rb
diff --git a/config/initializers/6_zeitwerk.rb b/config/initializers/6_zeitwerk.rb
@@ -0,0 +1,4 @@
+Rails.autoloaders.main.ignore(
+  Rails.root.join('lib/generators'),
+  Rails.root.join('lib/tasks')
+)
diff --git a/app/registries/foreman/access_permissions.rb → config/initializers/f_foreman_permissions.rb b/app/registries/foreman/access_permissions.rb → config/initializers/f_foreman_permissions.rb
diff --git a/app/registries/foreman/settings/auth.rb → ...g/initializers/f_foreman_settings_auth.rb b/app/registries/foreman/settings/auth.rb → ...g/initializers/f_foreman_settings_auth.rb
@@ -87,7 +87,7 @@
     setting('websockets_encrypt',
       type: :boolean,
       description: N_("VNC/SPICE websocket proxy console access encryption (websockets_ssl_key/cert setting required)"),
-      default: !!SETTINGS[:require_ssl],
+      default: !!SETTINGS[:require_ssl], # rubocop:disable Style/DoubleNegation
       full_name: N_('Websockets encryption'))
     validates('websockets_encrypt', ->(value) { !value || !(Setting["websockets_ssl_key"].empty? || Setting["websockets_ssl_cert"].empty?) }, message: N_("Unable to turn on websockets_encrypt, either websockets_ssl_key or websockets_ssl_cert is missing"))
     validates('websockets_ssl_key', ->(value) { !Setting["websockets_encrypt"] || !value.empty? }, message: N_("Unable to unset websockets_ssl_key when websockets_encrypt is on"))

diff --git a/app/registries/foreman/settings/cfgmgmt.rb → ...nitializers/f_foreman_settings_cfgmgmt.rb b/app/registries/foreman/settings/cfgmgmt.rb → ...nitializers/f_foreman_settings_cfgmgmt.rb
diff --git a/app/registries/foreman/settings/email.rb → .../initializers/f_foreman_settings_email.rb b/app/registries/foreman/settings/email.rb → .../initializers/f_foreman_settings_email.rb
diff --git a/app/registries/foreman/settings/facts.rb → .../initializers/f_foreman_settings_facts.rb b/app/registries/foreman/settings/facts.rb → .../initializers/f_foreman_settings_facts.rb
diff --git a/app/registries/foreman/settings/general.rb → ...nitializers/f_foreman_settings_general.rb b/app/registries/foreman/settings/general.rb → ...nitializers/f_foreman_settings_general.rb
diff --git a/...gistries/foreman/settings/notification.rb → ...lizers/f_foreman_settings_notification.rb b/...gistries/foreman/settings/notification.rb → ...lizers/f_foreman_settings_notification.rb
diff --git a/...gistries/foreman/settings/provisioning.rb → ...lizers/f_foreman_settings_provisioning.rb b/...gistries/foreman/settings/provisioning.rb → ...lizers/f_foreman_settings_provisioning.rb
diff --git a/config/initializers/foreman.rb b/config/initializers/foreman.rb
@@ -1,11 +1,6 @@
 # stdlib dependencies
 require 'English'
 
-# Registries from app/registries/ that do not create a namespace
-# should be loaded manually due to Zeitwerk
-require 'foreman/access_permissions'
-require 'foreman/settings'
-
 Rails.application.config.before_initialize do
   # load topbar
   Menu::Loader.load

diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
diff --git a/test/unit/shared/access_permissions_test_base.rb b/test/unit/shared/access_permissions_test_base.rb
@@ -1,5 +1,4 @@
 require 'foreman/access_control'
-require 'foreman/access_permissions'
 
 module AccessPermissionsTestBase
   extend ActiveSupport::Concern