diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index e7e1d82..d4cfd79 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -3,12 +3,15 @@ name: Deploy Development on: push: branches: [develop] + workflow_dispatch: jobs: deploy: runs-on: ubuntu-latest steps: - name: Deploy Karatewiki to development (Raspberry Pi 5) + env: + DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} run: | set -e echo "=== Deploying Karatewiki to DEVELOPMENT ===" @@ -48,16 +51,79 @@ jobs: echo "created $TARGET/.env from dev defaults" umask 022 fi + + set -a + source ./.env + set +a + docker compose -f docker-compose.dev-env.yml build mediawiki docker compose -f docker-compose.dev-env.yml up -d db - # Warte auf MariaDB und initialisiere Schema falls DB noch leer ist + # Warte auf MariaDB for i in $(seq 1 20); do if docker compose -f docker-compose.dev-env.yml exec -T db healthcheck.sh --connect --innodb_initialized >/dev/null 2>&1; then break fi sleep 2 done + docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php + + # Pruefe, ob bereits echte Wiki-Seiten aus Strato importiert wurden + PAGE_COUNT="$(docker compose -f docker-compose.dev-env.yml exec -T db mariadb -N -B -u root -p"${MW_DB_ROOT_PASSWORD}" "$MW_DB_NAME" -e "SELECT COUNT(*) FROM ${MW_DB_PREFIX}page;" 2>/dev/null | tr -d ' \r\n' || echo 0)" + echo "Aktuelle Seitenanzahl in Dev-DB: ${PAGE_COUNT:-0}" + + if [ "${PAGE_COUNT:-0}" -lt 10 ]; then + echo "Dev-DB hat noch keine Strato-Daten (< 10 Seiten). Pruefe SSH-Zugang fuer Erst-Import von Strato..." + SSH_KEY_FILE="" + cleanup_key() { + if [ -n "${TEMP_KEY:-}" ] && [ -f "${TEMP_KEY:-}" ]; then + rm -f "$TEMP_KEY" + fi + } + trap cleanup_key EXIT + + if [ -n "${DEPLOY_SSH_KEY:-}" ]; then + TEMP_KEY="$(mktemp)" + chmod 600 "$TEMP_KEY" + printf '%s\n' "$DEPLOY_SSH_KEY" > "$TEMP_KEY" + SSH_KEY_FILE="$TEMP_KEY" + echo "Nutze SSH-Key aus Gitea Secret DEPLOY_SSH_KEY." + elif [ -f "$HOME/.ssh/strato_fewo" ]; then + SSH_KEY_FILE="$HOME/.ssh/strato_fewo" + echo "Nutze lokalen SSH-Key $SSH_KEY_FILE." + fi + + if [ -n "$SSH_KEY_FILE" ]; then + STRATO_HOST="51539426.ssh.w1.strato.hosting" + STRATO_USER="stu100093250" + mkdir -p "$HOME/.ssh" + ssh-keyscan -H "$STRATO_HOST" >> "$HOME/.ssh/known_hosts" 2>/dev/null || true + SSH_OPTS=(-i "$SSH_KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=accept-new) + + DUMP_FILE="$TARGET/backups/db-init/01-karatewiki.sql" + echo "[Strato-Sync 1/3] Ziehe aktuellen MySQL-Dump von Strato (rein lesend)..." + ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \ + '/opt/RZphp84/bin/php-cli -r '\''$c=file_get_contents("Karate_Wiki_135/LocalSettings.php");preg_match("/wgDBpassword\s*=\s*\"([^\"]+)\"/",$c,$m);passthru(sprintf("mysqldump --single-transaction --no-tablespaces --default-character-set=binary -h rdbms.strato.de -u dbu1061679 -p%s dbs1754262",escapeshellarg($m[1])));'\''' \ + > "$DUMP_FILE" + echo " Dump gespeichert ($(du -h "$DUMP_FILE" | cut -f1))." + + echo "[Strato-Sync 2/3] Spiele Datenbank-Dump in MariaDB ($MW_DB_NAME) ein..." + docker compose -f docker-compose.dev-env.yml exec -T db \ + mariadb -u root -p"${MW_DB_ROOT_PASSWORD}" --default-character-set=binary "$MW_DB_NAME" < "$DUMP_FILE" + echo " Datenbank erfolgreich importiert!" + + echo "[Strato-Sync 3/3] Kopiere Beispiel-Videos (Seienchin, Tensho, Shisoshin) zum Testen..." + docker compose -f docker-compose.dev-env.yml up -d mediawiki + ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \ + 'cd Karate_Wiki_135/images && FILES=$(find . -type f \( -iname "*Seienchin*.mp4" -o -iname "*Tensho*.mp4" -o -iname "*Shisoshin*.mp4" -o -name ".htaccess" \) | head -n 15) && tar -cf - $FILES' \ + | docker compose -f docker-compose.dev-env.yml exec -T mediawiki tar -xf - -C /var/www/html/images/ + docker compose -f docker-compose.dev-env.yml exec -T mediawiki chown -R www-data:www-data /var/www/html/images + echo " Beispiel-Videos erfolgreich kopiert!" + else + echo "HINWEIS: Kein DEPLOY_SSH_KEY Secret in Gitea gefunden – ueberspringe automatischen Strato-Erstimport." + fi + fi + docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php update --quick if ! docker compose -f docker-compose.dev-env.yml up -d --wait; then echo "compose up --wait failed — mediawiki logs:" diff --git a/.gitea/workflows/sync-from-strato.yml b/.gitea/workflows/sync-from-strato.yml index d06acc2..1a90e6c 100644 --- a/.gitea/workflows/sync-from-strato.yml +++ b/.gitea/workflows/sync-from-strato.yml @@ -118,3 +118,4 @@ jobs: fi echo "=== Sync von Strato erfolgreich abgeschlossen! ===" +