From 480be5e60c3559da23251d5c222883e0c1098acf Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 11 May 2024 23:53:25 +0200
Subject: [PATCH] Add changelog info for v4.3.0-alpha.3+glitch+cat+1.2.0

---
 .env.production.catcatnya                       | 3 +++
 CHANGELOG.md                                    | 7 +++++++
 config/initializers/active_record_encryption.rb | 2 +-
 redact-env.bash                                 | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.env.production.catcatnya b/.env.production.catcatnya
index c354989ba2..7b2d378775 100644
--- a/.env.production.catcatnya
+++ b/.env.production.catcatnya
@@ -5,6 +5,9 @@ SECRET_KEY_BASE=[REDACTED]
 OTP_SECRET=[REDACTED]
 VAPID_PRIVATE_KEY=[REDACTED]
 VAPID_PUBLIC_KEY=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[REDACTED]
 DB_HOST=[REDACTED]
 DB_PORT=[REDACTED]
 DB_NAME=[REDACTED]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6bc1638c..a12a730a46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 - Glitch-soc changes since and including 62bc36416f2d2defc77a501226afd0679b6ca252
 - Ruby version 3.3.1. Update your rbenv!
+- Mastodon/Catstodon now requires that these variables are set:
+
+  - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+  - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+  - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+
+  After `bundle install`, run `bin/rails db:encryption:init` to generate values and then assign the environment variable, for example in your `.env.production`.
 
 ## [v4.3.0-alpha.3+glitch+cat+1.1.3] - 2024-04-26
 
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index 7cda8c621c..f280c1acb4 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -8,7 +8,7 @@
   ENV.fetch(key) do
     abort <<~MESSAGE
 
-      Mastodon now requires that these variables are set:
+      Catstodon now requires that these variables are set:
 
         - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
         - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
diff --git a/redact-env.bash b/redact-env.bash
index 0249f3fb06..bf3f82097f 100755
--- a/redact-env.bash
+++ b/redact-env.bash
@@ -23,5 +23,8 @@ if [[ -f "$1" ]]; then
       -e 's/^ES_HOST=.*/ES_HOST=[REDACTED]/gi' \
       -e 's/^ES_PORT=.*/ES_PORT=[REDACTED]/gi' \
       -e 's/^ES_PREFIX=.*/ES_PREFIX=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=.*/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=.*/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=.*/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[REDACTED]/gi' \
       "$1"
 fi