From 6365f7b1b1a22ef8a7960c536bb23e5bbe9c016e Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Wed, 20 Nov 2024 11:12:40 -0500
Subject: [PATCH] Fix startup script, allow registering "admin" user

---
 abra.sh            | 2 +-
 entrypoint.sh.tmpl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/abra.sh b/abra.sh
index a997269..7b67875 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export ENTRYPOINT_CONF_VERSION=v2
+export ENTRYPOINT_CONF_VERSION=v3
 
 assets() {
   export OTP_SECRET=$(cat /run/secrets/otp_secret)
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 01abc08..a4d9ece 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -3,5 +3,10 @@
 set -eu
 
 export DB_PASS=$(cat /run/secrets/db_password)
+export OTP_SECRET=$(cat $OTP_SECRET_FILE)
+export SECRET_KEY_BASE=$(cat $SECRET_KEY_BASE_FILE)
+export VAPID_PRIVATE_KEY=$(cat $VAPID_PRIVATE_KEY_FILE)
+
+sed -i '/- admin$/d' /opt/mastodon/config/settings.yml
 
 /usr/bin/tini -s -- "$@"