Upgrade to upstream v4.5.6+1.2.0

Applies the changes defined in https://github.com/hometown-fork/hometown/releases/tag/v4.5.6%2Bhometown-1.2.0
 (with one exception: I ignored the optional fasp Sidekiq queue)

There was a long gap in upstream releases,
 and the hometown fork skipped over 4.3.x and 4.4.x
 so there are a lot of changes here.

NB: this isn't the current up-to-date version of hometown,
 but the later releases suggest doing the 1.2.0 upgrade
 before moving on. So I'm giving Coop-Cloud operators that option

.drone.yml

@@ -38,7 +38,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -54,11 +54,9 @@ DB_PORT=5432
 REDIS_HOST=redis
 REDIS_PORT=6379
 # REDIS_URL=
-# REDIS_NAMESPACE=
 # CACHE_REDIS_HOST=
 # CACHE_REDIS_PORT=
 # CACHE_REDIS_URL=
-# CACHE_REDIS_NAMESPACE=
 
 # ElasticSearch
 # --------------------------------------
@@ -79,6 +77,9 @@ SECRET_VAPID_PRIVATE_KEY_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_SMTP_PASSWORD_VERSION=v1
 SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
+SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION=v1
+SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION=v1
+SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION=v1
 
 # Web Push
 # ========

abra.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ENTRYPOINT_CONF_VERSION=v8
+export ENTRYPOINT_CONF_VERSION=v9
 
 file_env() {
   local var="$1"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.15-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rake db:migrate; bundle exec rails s -p 3000"
     networks: &bothNetworks
       - proxy
@@ -19,7 +19,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=1.1.9+v4.0.15-hometown-1.1.1"
+        - "coop-cloud.${STACK_NAME}.version=3.0.0+v4.5.6-hometown-1.2.0"
     configs: &configs
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
@@ -33,12 +33,17 @@ services:
       - secret_key_base
       - smtp_password
       - vapid_private_key
+      - enc_det_key
+      - enc_salt
+      - enc_pri_key
     environment: &env
+      - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_FILE=/run/secrets/enc_det_key
+      - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_FILE=/run/secrets/enc_salt
+      - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_FILE=/run/secrets/enc_pri_key
       - ALLOW_ACCESS_TO_HIDDEN_SERVICE
       - ALTERNATE_DOMAINS
       - AUTHORIZED_FETCH
       - CACHE_REDIS_HOST
-      - CACHE_REDIS_NAMESPACE
       - CACHE_REDIS_PORT
       - CACHE_REDIS_URL
       - DB_HOST
@@ -97,7 +102,6 @@ services:
       - RAILS_ENV
       - RAILS_SERVE_STATIC_FILES
       - REDIS_HOST
-      - REDIS_NAMESPACE
       - REDIS_PORT
       - REDIS_URL
       - SAML_ACS_URL
@@ -143,7 +147,7 @@ services:
       - WEB_DOMAIN
 
   streaming:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.15-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0-streaming
     command: node ./streaming
     configs: *configs
     entrypoint: *entrypoint
@@ -164,7 +168,7 @@ services:
     volumes: *appVolume # used to make sure this volume is created
 
   sidekiq:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.15-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0
     secrets: *secrets
     command: bundle exec sidekiq
     configs: *configs
@@ -199,7 +203,7 @@ services:
 
 
   redis:
-    image: redis:7.2-alpine
+    image: redis:7.4-alpine
     networks: *internalNetwork
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
@@ -222,6 +226,15 @@ secrets:
   smtp_password:
     name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
     external: true
+  enc_det_key:
+    name: ${STACK_NAME}_enc_det_key_${SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION}
+    external: true
+  enc_salt:
+    name: ${STACK_NAME}_enc_salt_${SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION}
+    external: true
+  enc_pri_key:
+    name: ${STACK_NAME}_enc_pri_key_${SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION}
+    external: true
 
 volumes:
   app:

entrypoint.sh.tmpl

@@ -30,6 +30,9 @@ file_env "SECRET_KEY_BASE"
 file_env "SMTP_PASSWORD"
 file_env "VAPID_PRIVATE_KEY"
 file_env "AWS_SECRET_ACCESS_KEY"
+file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
+file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
+file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
 
 {{ if eq (env "OIDC_ENABLED") "true" }}
 file_env "OIDC_CLIENT_SECRET"

release/3.0.0+v4.5.6-hometown-1.2.0

@@ -0,0 +1,20 @@
+!!! It is recommended to update to this version before moving on to later updates !!!
+
+- Redis Namespaces are no longer supported! If you use REDIS_NAMESPACE or CACHE_REDIS_NAMESPACE in your config, you'll have to remove it.
+
+- Three new secrets have been introduced:
+  * Add the keys to your env:
+SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION=v1
+SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION=v1
+SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION=v1
+  * Create the keys, e.g. with `abra app secret generate -a your.app.domain`
+
+- As with every mastodon upgrade, you'll need to migrate databases by running:
+```
+abra app run your.app.domain app bash -c "SKIP_POST_DEPLOYMENT_MIGRATIONS=true rails db:migrate"
+abra app undeploy your.app.domain
+abra app deploy your.app.domain
+abra app run your.app.domain app rails db:migrate
+```
+
+See the full release notes for details: https://github.com/hometown-fork/hometown/releases/tag/v4.5.6%2Bhometown-1.2.0