From becc1bd737210d0c6f545b4b6a7d819cb30ea8a8 Mon Sep 17 00:00:00 2001 From: boban Date: Sun, 26 Apr 2026 10:55:40 +0200 Subject: [PATCH] Fix: apply-domains korrigiert alle VITE_REVERB_* und REVERB_* .env-Werte Co-Authored-By: Claude Sonnet 4.6 --- scripts/mailwolt-apply-domains | 43 ++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/scripts/mailwolt-apply-domains b/scripts/mailwolt-apply-domains index cd49b90..bfe0e8b 100755 --- a/scripts/mailwolt-apply-domains +++ b/scripts/mailwolt-apply-domains @@ -273,21 +273,38 @@ ENV_FILE="${APP_DIR}/.env" if [ -n "${UI_HOST}" ] && [ -f "${ENV_FILE}" ]; then APP_SCHEME="http" [ "${UI_HAS_CERT}" = "1" ] && APP_SCHEME="https" + REVERB_PORT_VAL="443" + [ "${UI_HAS_CERT}" != "1" ] && REVERB_PORT_VAL="80" - # APP_HOST und APP_URL setzen - if grep -q '^APP_HOST=' "${ENV_FILE}"; then - sed -i "s|^APP_HOST=.*|APP_HOST=${UI_HOST}|" "${ENV_FILE}" - else - echo "APP_HOST=${UI_HOST}" >> "${ENV_FILE}" - fi - if grep -q '^APP_URL=' "${ENV_FILE}"; then - sed -i "s|^APP_URL=.*|APP_URL=${APP_SCHEME}://\${APP_HOST}|" "${ENV_FILE}" - fi + _env_set() { + local key="$1" val="$2" + if grep -q "^${key}=" "${ENV_FILE}"; then + sed -i "s|^${key}=.*|${key}=${val}|" "${ENV_FILE}" + else + echo "${key}=${val}" >> "${ENV_FILE}" + fi + } - # REVERB_HOST explizit setzen (falls nicht per ${APP_HOST} aufgelöst) - if grep -q '^REVERB_HOST=' "${ENV_FILE}"; then - sed -i "s|^REVERB_HOST=.*|REVERB_HOST=\${APP_HOST}|" "${ENV_FILE}" - fi + _env_set "APP_HOST" "${UI_HOST}" + _env_set "APP_URL" "${APP_SCHEME}://\${APP_HOST}" + + # Reverb: Client-seitige Verbindung über nginx-Proxy (Domain + 443) + _env_set "REVERB_HOST" "\${APP_HOST}" + _env_set "REVERB_PORT" "${REVERB_PORT_VAL}" + _env_set "REVERB_SCHEME" "${APP_SCHEME}" + _env_set "REVERB_PATH" "/ws" + + # Reverb: Server-seitiger Prozess (lokal auf 8080) + _env_set "REVERB_SERVER_HOST" "127.0.0.1" + _env_set "REVERB_SERVER_PORT" "8080" + _env_set "REVERB_SERVER_SCHEME" "http" + _env_set "REVERB_SERVER_PATH" "" + + # Vite-Variablen (werden ins JS-Bundle eingebacken) + _env_set "VITE_REVERB_HOST" "\${REVERB_HOST}" + _env_set "VITE_REVERB_PORT" "\${REVERB_PORT}" + _env_set "VITE_REVERB_SCHEME" "\${REVERB_SCHEME}" + _env_set "VITE_REVERB_PATH" "\${REVERB_PATH}" # Assets neu bauen damit wsHost im JS den richtigen Domain-Namen hat if command -v npm >/dev/null 2>&1 && [ -f "${APP_DIR}/package.json" ]; then