Use supervisor and fixup env generation

start.sh

@@ -1,32 +1,47 @@
-#!/bin/bash -eu
-echo "=>Configuring mastodon<="
-bash /app/code/mastodon.env.template > /app/data/.env.production
+#!/bin/bash
 
-if ! [ -d /app/data/system ]; then
-    echo "=>First run, generating keys and setting up the DB<="
+set -eu
 
-    export RANDFILE=/tmp/.rnd
-    echo -e "SECRET_KEY_BASE=$(openssl rand -hex 64)\nOTP_SECRET=$(openssl rand -hex 64)" | \
-        tee /app/data/.keys.env >> /app/data/.env.production
+mkdir -p /tmp/mastodon /app/data/system /run/mastodon
 
-    HOME=/app/data bundle exec rake mastodon:webpush:generate_vapid_key | \
-        tee -a /app/data/.keys.env >> /app/data/.env.production
-
-    SAFETY_ASSURED=1 HOME=/app/data bundle exec rails db:schema:load db:seed
-
-    # the app writes to the following dirs:
-    mkdir -p /app/data/system && chown cloudron:cloudron /app/data/system
-
-else
-    cat /app/data/.keys.env >> /app/data/.env.production
+if [[ ! -f /app/data/env.production ]]; then
+    echo "==> Copying env template on first run"
+    cp /app/code/env.template /app/data/env.production
 fi
 
-echo "=>Starting mastodon<="
+echo "==> Configuring mastodon"
+sed -e "s/DB_HOST=.*/DB_HOST=${CLOUDRON_POSTGRESQL_HOST}/g" \
+    -e "s/DB_PORT=.*/DB_PORT=${CLOUDRON_POSTGRESQL_PORT}/g" \
+    -e "s/DB_NAME=.*/DB_NAME=${CLOUDRON_POSTGRESQL_DATABASE}/g" \
+    -e "s/DB_USER=.*/DB_USER=${CLOUDRON_POSTGRESQL_USERNAME}/g" \
+    -e "s/DB_PASS=.*/DB_PASS=${CLOUDRON_POSTGRESQL_PASSWORD}/g" \
+    -e "s/REDIS_HOST=.*/REDIS_HOST=${CLOUDRON_REDIS_HOST}/g" \
+    -e "s/REDIS_PORT=.*/REDIS_PORT=${CLOUDRON_REDIS_PORT}/g" \
+    -e "s/REDIS_PASSWORD=.*/REDIS_PASSWORD=${CLOUDRON_REDIS_PASSWORD}/g" \
+    -e "s/SMTP_SERVER=.*/SMTP_SERVER=${CLOUDRON_MAIL_SMTP_SERVER}/g" \
+    -e "s/SMTP_PORT=.*/SMTP_PORT=${CLOUDRON_MAIL_SMTP_PORT}/g" \
+    -e "s/SMTP_FROM_ADDRESS=.*/SMTP_FROM_ADDRESS=${CLOUDRON_MAIL_FROM}/g" \
+    -e "s/SMTP_LOGIN=.*/SMTP_LOGIN=${CLOUDRON_MAIL_SMTP_USERNAME}/g" \
+    -e "s/SMTP_PASSWORD=.*/SMTP_PASSWORD=${CLOUDRON_MAIL_SMTP_PASSWORD}/g" \
+    -e "s/LOCAL_DOMAIN=.*/LOCAL_DOMAIN=${CLOUDRON_APP_DOMAIN}/g" \
+    -i /app/data/env.production
 
-SUDO='sudo -u cloudron -H -E'
-PORT=3000 $SUDO bundle exec puma -C config/puma.rb &
-PORT=4000 STREAMING_CLUSTER_NUM=1 $SUDO npm run start &
-DB_POOL=25 MALLOC_ARENA_MAX=2 $SUDO bundle exec sidekiq -c 25 &
+if grep -q "^SECRET_KEY_BASE=$" /app/data/env.production; then
+    echo "==> Generating secrets"
+    export RANDFILE=/tmp/.rnd
+    sed -i -e "s/SECRET_KEY_BASE=.*/SECRET_KEY_BASE=$(openssl rand -hex 64)/" \
+        -e "s/OTP_SECRET=.*/OTP_SECRET=$(openssl rand -hex 64)/" \
+        /app/data/env.production
+
+    echo "==> Generating vapid keys"
+    HOME=/app/data bundle exec rake mastodon:webpush:generate_vapid_key >> /app/data/env.production
+
+    echo "==> Init database"
+    HOME=/app/data SAFETY_ASSURED=1 bundle exec rails db:schema:load db:seed
+fi
+
+chown -R cloudron:cloudron /app/data /tmp/mastodon /run/mastodon
+
+echo "==> Starting mastodon"
+exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i Mastodon
 
-mkdir -p /run/nginx/log /run/nginx/body /run/nginx/cache
-nginx -g 'daemon off;'