From 923d8b6049930d904d988d714f7a76a4076fccc7 Mon Sep 17 00:00:00 2001 From: Lars Stommer Date: Sat, 24 Oct 2026 18:43:42 +0200 Subject: [PATCH] Fix .env Auslesen ohne source (Klammerfehler bei MW_SITENAME behoben) --- .gitea/workflows/deploy-dev.yml | 10 ++++++---- .gitea/workflows/sync-from-strato.yml | 9 ++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index d4cfd79..4cfff49 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -39,7 +39,7 @@ jobs: 'MW_ENV=development' \ 'MW_PORT=3093' \ 'MW_SERVER=http://192.168.2.49:3093' \ - 'MW_SITENAME=Karate (DEV)' \ + 'MW_SITENAME=Karate-DEV' \ 'MW_DB_NAME=karatewiki_dev' \ 'MW_DB_USER=karatewiki_dev' \ 'MW_DB_PASSWORD=dev_password_change_me' \ @@ -52,9 +52,11 @@ jobs: umask 022 fi - set -a - source ./.env - set +a + # Klammern in bestehender .env bereinigen und DB-Variablen sicher ohne "source" auslesen + sed -i 's/MW_SITENAME=Karate (DEV)/MW_SITENAME=Karate-DEV/' .env 2>/dev/null || true + MW_DB_NAME="$(grep '^MW_DB_NAME=' .env | cut -d= -f2-)" + MW_DB_ROOT_PASSWORD="$(grep '^MW_DB_ROOT_PASSWORD=' .env | cut -d= -f2-)" + MW_DB_PREFIX="$(grep '^MW_DB_PREFIX=' .env | cut -d= -f2-)" docker compose -f docker-compose.dev-env.yml build mediawiki docker compose -f docker-compose.dev-env.yml up -d db diff --git a/.gitea/workflows/sync-from-strato.yml b/.gitea/workflows/sync-from-strato.yml index 1a90e6c..4c3ab29 100644 --- a/.gitea/workflows/sync-from-strato.yml +++ b/.gitea/workflows/sync-from-strato.yml @@ -34,7 +34,6 @@ jobs: set -euo pipefail STRATO_HOST="51539426.ssh.w1.strato.hosting" STRATO_USER="stu100093250" - STRATO_WIKI="Karate_Wiki_135" if [ "$TARGET_ENV" = "production" ]; then TARGET="/home/lars/docker/karatewiki" @@ -46,12 +45,9 @@ jobs: echo "=== Starte Read-Only Sync von Strato nach $TARGET ($SYNC_MODE) ===" cd "$TARGET" - # Lade lokale .env fuer DB-Zugangsdaten des Ziel-Containers - set -a - source ./.env - set +a + MW_DB_NAME="$(grep '^MW_DB_NAME=' .env | cut -d= -f2-)" + MW_DB_ROOT_PASSWORD="$(grep '^MW_DB_ROOT_PASSWORD=' .env | cut -d= -f2-)" - # SSH-Key vorbereiten (aus Gitea Secret DEPLOY_SSH_KEY oder lokal auf dem Pi) SSH_KEY_FILE="" cleanup_key() { if [ -n "${TEMP_KEY:-}" ] && [ -f "${TEMP_KEY:-}" ]; then @@ -118,4 +114,3 @@ jobs: fi echo "=== Sync von Strato erfolgreich abgeschlossen! ===" -