Merge remote-tracking branch 'parent/main' into upstream-20240422

2024-04-22 08:58:37 +09:00 · 2024-04-22 08:58:37 +09:00 · 44f4a93430
commit 44f4a93430
parent 389ae9d339 35b517c207
100 changed files with 770 additions and 441 deletions
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@ -36,6 +36,15 @@ namespace :mastodon do
        env[key] = SecureRandom.hex(64)
      end

+      # Required by ActiveRecord encryption feature
+      %w(
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+      ).each do |key|
+        env[key] = SecureRandom.alphanumeric(32)
+      end
+
      vapid_key = Webpush.generate_key

      env['VAPID_PRIVATE_KEY'] = vapid_key.private_key