Mastodon fixes.

docker-compose.yml

@@ -491,7 +491,7 @@ services:
       PDS_REPORT_SERVICE_DID: ${PDS_REPORT_SERVICE_DID}
       PDS_CRAWLERS: ${PDS_CRAWLERS}
       LOG_ENABLED: true
-    expose: 
+    expose:
       - 3000
     image: ghcr.io/bluesky-social/pds:latest
     labels:
@@ -2960,13 +2960,13 @@ services:
       DB_PASS: ${MASTODON_PG_DB_PASSWORD}
       DB_PORT: 5432
       ES_ENABLED: false
-      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: 
-      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: 
-      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: 
-      SECRET_KEY_BASE: 
-      OTP_SECRET: 
-      VAPID_PRIVATE_KEY: 
-      VAPID_PUBLIC_KEY: 
+      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: ${MASTODON_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY}
+      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: ${MASTODON_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY}
+      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: ${MASTODON_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT}
+      SECRET_KEY_BASE: ${MASTODON_SECRET_KEY_BASE}
+      OTP_SECRET: ${MASTODON_OTP_SECRET}
+      VAPID_PRIVATE_KEY: ${MASTODON_VAPID_PRIVATE_KEY}
+      VAPID_PUBLIC_KEY: ${MASTODON_VAPID_PUBLIC_KEY}
       SMTP_SERVER: postal-smtp
       SMTP_PORT: 25
       SMTP_LOGIN: ${POSTAL_SMTP_AUTH_USER}