Skip to content

A platform for community discussion. Free, open, simple.

DEV: Move bootstrap site settings from initializers to seeds (#39942)

David Taylor1aa8f702d8e3
diff --git a/config/initializers/005-site_settings.rb b/config/initializers/005-site_settings.rb
index fa530bfcae1..7527f49a449 100644
--- a/config/initializers/005-site_settings.rb
+++ b/config/initializers/005-site_settings.rb
@@ -19,11 +19,6 @@ Rails.application.config.to_prepare do
begin
SiteSetting.refresh!
- unless String === SiteSetting.push_api_secret_key &&
- SiteSetting.push_api_secret_key.length == 32
- SiteSetting.push_api_secret_key = SecureRandom.hex
- end
-
# Check for circular dependencies in site settings.
SiteSetting.type_supervisor.dependencies.order
rescue ActiveRecord::StatementInvalid
diff --git a/config/initializers/006-ensure_login_hint.rb b/config/initializers/006-ensure_login_hint.rb
deleted file mode 100644
index 830ed10d7f4..00000000000
--- a/config/initializers/006-ensure_login_hint.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-return if GlobalSetting.skip_db?
-
-Rails.application.config.to_prepare do
- # Some sanity checking so we don't count on an unindexed column on boot
- begin
- if ActiveRecord::Base.connection.table_exists?(:users) && User.limit(20).count < 20 &&
- User.where(admin: true).human_users.count == 0
- notice =
- if GlobalSetting.developer_emails.blank?
- "Congratulations, you installed Discourse! Unfortunately, no administrator emails were defined during setup, so finalizing the configuration <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>may be difficult</a>."
- else
- emails = GlobalSetting.developer_emails.split(",")
- if emails.length > 1
- emails = emails[0..-2].join(", ") << " or #{emails[-1]} "
- else
- emails = emails[0]
- end
- "Congratulations, you installed Discourse! Register a new admin account with #{emails} to finalize configuration."
- end
-
- if notice != SiteSetting.global_notice
- SiteSetting.global_notice = notice
- SiteSetting.has_login_hint = true
- end
- end
- rescue ActiveRecord::NoDatabaseError
- # Database might not have been created
- end
-end
diff --git a/config/initializers/100-push-notifications.rb b/config/initializers/100-push-notifications.rb
deleted file mode 100644
index cf4d8e6dab3..00000000000
--- a/config/initializers/100-push-notifications.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-return if GlobalSetting.skip_db?
-
-Rails.application.config.to_prepare do
- require "web-push"
-
- def generate_vapid_key?
- SiteSetting.vapid_public_key.blank? || SiteSetting.vapid_private_key.blank? ||
- SiteSetting.vapid_public_key_bytes.blank? || SiteSetting.vapid_base_url != Discourse.base_url
- end
-
- SiteSetting.vapid_base_url = Discourse.base_url if SiteSetting.vapid_base_url.blank?
-
- if generate_vapid_key?
- vapid_key = WebPush.generate_key
- SiteSetting.vapid_public_key = vapid_key.public_key
- SiteSetting.vapid_private_key = vapid_key.private_key
-
- SiteSetting.vapid_public_key_bytes =
- Base64.urlsafe_decode64(SiteSetting.vapid_public_key).bytes.join("|")
- SiteSetting.vapid_base_url = Discourse.base_url
-
- PushSubscription.delete_all if ActiveRecord::Base.connection.table_exists?(:push_subscriptions)
- end
-end
diff --git a/db/fixtures/991_vapid_keys.rb b/db/fixtures/991_vapid_keys.rb
new file mode 100644
index 00000000000..76a9a77190d
--- /dev/null
+++ b/db/fixtures/991_vapid_keys.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Regenerate the VAPID keypair whenever vapid_base_url drifts from Discourse.base_url —
+# push subscriptions are bound to {URL, public_key}, so a hostname change invalidates them.
+if SiteSetting.vapid_public_key.blank? || SiteSetting.vapid_private_key.blank? ||
+ SiteSetting.vapid_public_key_bytes.blank? || SiteSetting.vapid_base_url != Discourse.base_url
+ require "web-push"
+ vapid_key = WebPush.generate_key
+
+ SiteSetting.vapid_public_key = vapid_key.public_key
+ SiteSetting.vapid_private_key = vapid_key.private_key
+ SiteSetting.vapid_public_key_bytes =
+ Base64.urlsafe_decode64(SiteSetting.vapid_public_key).bytes.join("|")
+ SiteSetting.vapid_base_url = Discourse.base_url
+
+ PushSubscription.delete_all
+end
diff --git a/db/fixtures/992_push_api_secret_key.rb b/db/fixtures/992_push_api_secret_key.rb
new file mode 100644
index 00000000000..164a4931949
--- /dev/null
+++ b/db/fixtures/992_push_api_secret_key.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+unless String === SiteSetting.push_api_secret_key && SiteSetting.push_api_secret_key.length == 32
+ SiteSetting.push_api_secret_key = SecureRandom.hex
+end
diff --git a/db/fixtures/993_login_hint.rb b/db/fixtures/993_login_hint.rb
new file mode 100644
index 00000000000..08cb7362ced
--- /dev/null
+++ b/db/fixtures/993_login_hint.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+if RailsMultisite::ConnectionManagement.current_db != RailsMultisite::ConnectionManagement::DEFAULT
+ return
+end
+
+if User.limit(20).count < 20 && User.where(admin: true).human_users.count == 0
+ notice =
+ if GlobalSetting.developer_emails.blank?
+ "Congratulations, you installed Discourse! Unfortunately, no administrator emails were defined during setup, so finalizing the configuration <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>may be difficult</a>."
+ else
+ emails = GlobalSetting.developer_emails.split(",")
+ emails =
+ if emails.length > 1
+ emails[0..-2].join(", ") << " or #{emails[-1]} "
+ else
+ emails[0]
+ end
+ "Congratulations, you installed Discourse! Register a new admin account with #{emails} to finalize configuration."
+ end
+
+ if notice != SiteSetting.global_notice
+ SiteSetting.global_notice = notice
+ SiteSetting.has_login_hint = true
+ end
+end