Website (rinkplanner.programmschmiede.de) liegt jetzt im Repo unter web/: Sprachweiche nach Accept-Language (der User-Agent enthält keine Sprache), /de/ und /en/ als eigene URLs mit hreflang, Cookie für die manuelle Wahl, Texte in web/i18n.php, Markup in web/template.php. Deployment über tools/deploy_web.sh (--sync, --check, --all); /index.html leitet weiter. Hub: optionale englische Oberfläche über den DE/EN-Umschalter, Cookie RHUB_LANG, Route /language. Alle Texte (Views, Meldungen, Validierung, API-messages) stehen in hub/app/i18n_strings.php und laufen über t(); Datum und Zahlen folgen der Sprache. Die API behält ihre code-Felder und antwortet ohne Cookie weiter deutsch. deploy_hub.sh --check prüft jetzt Schlüsselparität und fehlende t()-Schlüssel. Doku: docs/website.md neu, docs/hub.md und AGENTS.md ergänzt.
300 lines
9.7 KiB
Bash
Executable file
300 lines
9.7 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Deployt den Rinkplanner-Hub auf rinkplanner-hub.programmschmiede.de.
|
|
#
|
|
# Aufruf:
|
|
# ./tools/deploy_hub.sh --check # Standard: Health, Sperren und Login-Seite prüfen
|
|
# ./tools/deploy_hub.sh --sync # Code + Konfiguration hochladen
|
|
# ./tools/deploy_hub.sh --install # Schema + Admin anlegen (einmalig)
|
|
# ./tools/deploy_hub.sh --all # sync + install + check
|
|
#
|
|
# Zugangsdaten kommen aus docs/credentials.txt (gitignored).
|
|
# Der Installer löscht sich nach Erfolg selbst; das Admin-Passwort wird nur
|
|
# per HTTPS übergeben und nie auf dem Server gespeichert.
|
|
set -euo pipefail
|
|
|
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
CREDENTIALS="$REPO_ROOT/docs/credentials.txt"
|
|
HUB_DIR="$REPO_ROOT/hub"
|
|
REMOTE_DIR="rinkplanner-hub.programmschmiede.de"
|
|
PUBLIC_URL="https://rinkplanner-hub.programmschmiede.de"
|
|
|
|
MODE="check"
|
|
FORCE=0
|
|
while [[ $# -gt 0 ]]; do
|
|
case "$1" in
|
|
--check) MODE="check" ;;
|
|
--sync) MODE="sync" ;;
|
|
--install) MODE="install" ;;
|
|
--all) MODE="all" ;;
|
|
-h|--help)
|
|
sed -n '2,16p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
|
|
exit 0
|
|
;;
|
|
*) echo "Unbekannte Option: $1" >&2; exit 2 ;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
[[ -f "$CREDENTIALS" ]] || { echo "Fehlt: $CREDENTIALS" >&2; exit 1; }
|
|
|
|
cred() {
|
|
grep -m1 "^$1=" "$CREDENTIALS" | cut -d= -f2- | tr -d '\r'
|
|
}
|
|
|
|
FTP_URL="$(cred FTP_URL)"
|
|
FTP_USER="$(cred FTP_USER)"
|
|
FTP_PASSWORD="$(cred FTP_PASSWORD)"
|
|
DB_NAME="$(cred DB_NAME)"
|
|
DB_USER="$(cred DB_USER)"
|
|
DB_PASSWORD="$(cred DB_PASSWORD)"
|
|
HUB_ADMIN_USER="$(cred HUB_ADMIN_USER)"
|
|
HUB_ADMIN_PASSWORD="$(cred HUB_ADMIN_PASSWORD)"
|
|
|
|
HOST="${FTP_URL#ftp://}"
|
|
HOST="${HOST#ftps://}"
|
|
HOST="${HOST%%/*}"
|
|
HOST="${HOST%%:*}"
|
|
[[ -n "$HOST" && -n "$FTP_USER" ]] || { echo "FTP-Zugang unvollständig." >&2; exit 1; }
|
|
|
|
TMP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/rinkplanner-hub.XXXXXX")"
|
|
trap 'rm -rf "$TMP_DIR"' EXIT
|
|
|
|
CURL=(curl --ssl-reqd --insecure --silent --show-error --connect-timeout 20 --max-time 900 --user "$FTP_USER:$FTP_PASSWORD")
|
|
|
|
ftp_url() {
|
|
printf 'ftp://%s/%s/%s' "$HOST" "$REMOTE_DIR" "$1"
|
|
}
|
|
|
|
ftp_put() {
|
|
local local_path="$1" remote_path="$2"
|
|
"${CURL[@]}" --ftp-create-dirs -T "$local_path" "$(ftp_url "$remote_path")"
|
|
}
|
|
|
|
ftp_get() {
|
|
local remote_path="$1" local_path="$2"
|
|
"${CURL[@]}" -o "$local_path" "$(ftp_url "$remote_path")"
|
|
}
|
|
|
|
ftp_chmod() {
|
|
local mode="$1" remote_path="$2"
|
|
"${CURL[@]}" "ftp://$HOST/" -Q "SITE CHMOD $mode $REMOTE_DIR/$remote_path" >/dev/null || true
|
|
}
|
|
|
|
http_code() {
|
|
curl -sS -o /dev/null -w '%{http_code}' --max-time 30 "$1" || true
|
|
}
|
|
|
|
make_config() {
|
|
local token="$1"
|
|
HUB_INSTALL_TOKEN="$token" HUB_PUBLIC_URL="$PUBLIC_URL" \
|
|
DB_NAME="$DB_NAME" DB_USER="$DB_USER" DB_PASSWORD="$DB_PASSWORD" \
|
|
python3 - "$CREDENTIALS" "$TMP_DIR/config.local.php" <<'PY'
|
|
import os
|
|
import sys
|
|
|
|
def php(value):
|
|
return "'" + str(value).replace('\\', '\\\\').replace("'", "\\'") + "'"
|
|
|
|
path, target = sys.argv[1], sys.argv[2]
|
|
values = {}
|
|
with open(path, encoding='utf-8') as handle:
|
|
for line in handle:
|
|
line = line.rstrip('\n').rstrip('\r')
|
|
if '=' in line and not line.lstrip().startswith('#'):
|
|
key, value = line.split('=', 1)
|
|
values[key] = value
|
|
|
|
config = f"""<?php
|
|
declare(strict_types=1);
|
|
|
|
return [
|
|
'db' => [
|
|
'host' => 'localhost',
|
|
'port' => 3306,
|
|
'name' => {php(values.get('DB_NAME', ''))},
|
|
'user' => {php(values.get('DB_USER', ''))},
|
|
'password' => {php(values.get('DB_PASSWORD', ''))},
|
|
'charset' => 'utf8mb4',
|
|
],
|
|
'app' => [
|
|
'base_path' => '',
|
|
'public_url' => {php(os.environ['HUB_PUBLIC_URL'])},
|
|
'storage_path' => dirname(__DIR__) . '/storage',
|
|
'install_token' => {php(os.environ['HUB_INSTALL_TOKEN'])},
|
|
'max_routine_bytes' => 8 * 1024 * 1024,
|
|
'max_audio_bytes' => 50 * 1024 * 1024,
|
|
'session_idle_seconds' => 14 * 86400,
|
|
'session_absolute_seconds' => 30 * 86400,
|
|
'remember_seconds' => 30 * 86400,
|
|
'login_window_seconds' => 900,
|
|
'login_max_per_user' => 5,
|
|
'login_max_per_ip' => 10,
|
|
'uploads_per_hour' => 20,
|
|
],
|
|
];
|
|
"""
|
|
with open(target, 'w', encoding='utf-8') as handle:
|
|
handle.write(config)
|
|
os.chmod(target, 0o600)
|
|
PY
|
|
}
|
|
|
|
upload_tree() {
|
|
local source_root="$1" remote_prefix="$2"
|
|
while IFS= read -r file; do
|
|
local relative="${file#"$source_root"/}"
|
|
case "$relative" in
|
|
*.example.php|config.local.php|.DS_Store|*.swp) continue ;;
|
|
esac
|
|
ftp_put "$file" "$remote_prefix$relative"
|
|
echo " $remote_prefix$relative"
|
|
done < <(find "$source_root" -type f | sort)
|
|
}
|
|
|
|
do_sync() {
|
|
local token
|
|
token="$(openssl rand -hex 24)"
|
|
make_config "$token"
|
|
echo "Lade App-Code hoch …"
|
|
upload_tree "$HUB_DIR/app" "app/"
|
|
upload_tree "$HUB_DIR/views" "views/"
|
|
upload_tree "$HUB_DIR/sql" "sql/"
|
|
upload_tree "$HUB_DIR/web" ""
|
|
echo "Lade Konfiguration hoch …"
|
|
ftp_put "$TMP_DIR/config.local.php" "app/config.local.php"
|
|
ftp_chmod 600 "app/config.local.php"
|
|
echo "Sync fertig. Install-Token liegt nur auf dem Server."
|
|
}
|
|
|
|
install_if_needed() {
|
|
local config_file="$TMP_DIR/remote-config.php"
|
|
if ! ftp_get "app/config.local.php" "$config_file" 2>/dev/null; then
|
|
echo "Konfiguration fehlt auf dem Server; zuerst --sync ausführen." >&2
|
|
exit 1
|
|
fi
|
|
local token
|
|
token="$(python3 - "$config_file" <<'PY'
|
|
import re, sys
|
|
text = open(sys.argv[1], encoding='utf-8').read()
|
|
match = re.search(r"'install_token'\s*=>\s*'([^']+)'", text)
|
|
print(match.group(1) if match else '')
|
|
PY
|
|
)"
|
|
[[ -n "$token" ]] || { echo "Install-Token nicht gefunden." >&2; exit 1; }
|
|
|
|
ftp_put "$HUB_DIR/install.php" "install.php"
|
|
echo "Rufe Installer auf …"
|
|
local response status
|
|
response="$(curl -sS --max-time 300 -w '\n%{http_code}' \
|
|
--data-urlencode "token=$token" \
|
|
--data-urlencode "admin_user=$HUB_ADMIN_USER" \
|
|
--data-urlencode "admin_password=$HUB_ADMIN_PASSWORD" \
|
|
--data-urlencode "admin_display=$HUB_ADMIN_USER" \
|
|
"$PUBLIC_URL/install.php" 2>&1)" || true
|
|
status="${response##*$'\n'}"
|
|
local body="${response%$'\n'*}"
|
|
echo "$body"
|
|
"${CURL[@]}" "ftp://$HOST/" -Q "-DELE $REMOTE_DIR/install.php" >/dev/null 2>&1 || true
|
|
if [[ "$status" != "200" ]]; then
|
|
echo "Installation fehlgeschlagen (HTTP $status)." >&2
|
|
exit 1
|
|
fi
|
|
echo "Installation abgeschlossen."
|
|
}
|
|
|
|
do_check() {
|
|
local ok=0
|
|
local health
|
|
health="$(curl -sS --max-time 30 "$PUBLIC_URL/health" || true)"
|
|
if [[ "$health" == *"ok"* ]]; then
|
|
echo "Health: OK"
|
|
else
|
|
echo "Health: FEHLER ($health)" >&2
|
|
ok=1
|
|
fi
|
|
local login_code config_code storage_code install_code
|
|
login_code="$(http_code "$PUBLIC_URL/login")"
|
|
config_code="$(http_code "$PUBLIC_URL/app/config.local.php")"
|
|
storage_code="$(http_code "$PUBLIC_URL/storage/")"
|
|
install_code="$(http_code "$PUBLIC_URL/install.php")"
|
|
[[ "$login_code" == "200" ]] && echo "Login-Seite: OK" || { echo "Login-Seite: HTTP $login_code" >&2; ok=1; }
|
|
[[ "$config_code" == "403" || "$config_code" == "404" ]] && echo "Konfiguration gesperrt: OK" || { echo "Konfiguration erreichbar: HTTP $config_code" >&2; ok=1; }
|
|
[[ "$storage_code" == "403" || "$storage_code" == "404" ]] && echo "Storage gesperrt: OK" || { echo "Storage erreichbar: HTTP $storage_code" >&2; ok=1; }
|
|
[[ "$install_code" == "404" ]] && echo "Installer entfernt: OK" || echo "Hinweis: Installer liefert HTTP $install_code" >&2
|
|
|
|
check_hub_texts || ok=1
|
|
|
|
local de_page en_page
|
|
de_page="$(curl -sS --max-time 30 -H 'Cookie: RHUB_LANG=de' "$PUBLIC_URL/login" || true)"
|
|
en_page="$(curl -sS --max-time 30 -H 'Cookie: RHUB_LANG=en' "$PUBLIC_URL/login" || true)"
|
|
[[ "$de_page" == *'<html lang="de">'* ]] && echo "Login deutsch: OK" || { echo "Login deutsch: html lang fehlt" >&2; ok=1; }
|
|
[[ "$en_page" == *'<html lang="en">'* ]] && echo "Login englisch: OK" || { echo "Login englisch: html lang fehlt" >&2; ok=1; }
|
|
[[ "$en_page" == *'Sign in'* ]] && echo "Englische Texte: OK" || { echo "Englische Texte fehlen" >&2; ok=1; }
|
|
|
|
local switch_headers
|
|
switch_headers="$(curl -sS -o /dev/null -D - --max-time 30 "$PUBLIC_URL/language?lang=en&next=%2Flogin" || true)"
|
|
if [[ "$switch_headers" == *'RHUB_LANG=en'* ]]; then
|
|
echo "Sprachwechsel: OK"
|
|
else
|
|
echo "Sprachwechsel setzt kein Cookie" >&2
|
|
ok=1
|
|
fi
|
|
|
|
if [[ "$ok" -ne 0 ]]; then
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
# Prüft, dass de und en dieselben Schlüssel haben und dass jeder in t()
|
|
# verwendete Schlüssel im Katalog steht.
|
|
check_hub_texts() {
|
|
echo "Prüfe Texte (hub/app/i18n_strings.php) …"
|
|
python3 - "$HUB_DIR" <<'PY'
|
|
import re
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
root = Path(sys.argv[1])
|
|
catalog = (root / 'app' / 'i18n_strings.php').read_text(encoding='utf-8')
|
|
blocks = re.split(r"\n '(de|en)' => \[", catalog)
|
|
if len(blocks) != 5:
|
|
print(' FEHLER: de/en-Blöcke nicht gefunden', file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
def keys(block):
|
|
return set(re.findall(r"^\s+'([^']+)'\s*=>", block, re.M))
|
|
|
|
de, en = keys(blocks[2]), keys(blocks[4])
|
|
status = 0
|
|
for missing in sorted(de - en):
|
|
print(f' FEHLER: en fehlt "{missing}"', file=sys.stderr)
|
|
status = 1
|
|
for extra in sorted(en - de):
|
|
print(f' FEHLER: de fehlt "{extra}"', file=sys.stderr)
|
|
status = 1
|
|
|
|
used = set()
|
|
for path in list((root / 'app').glob('*.php')) + list((root / 'views').glob('*.php')):
|
|
if path.name.startswith('i18n'):
|
|
continue
|
|
text = path.read_text(encoding='utf-8')
|
|
used.update(re.findall(r"\bt\('([a-z0-9_.]+)'", text))
|
|
|
|
for key in sorted(used - de):
|
|
if key.endswith('.'):
|
|
continue # dynamisch zusammengesetzt, z. B. t('invite.status.' . $status)
|
|
print(f' FEHLER: t(\'{key}\') fehlt im Katalog', file=sys.stderr)
|
|
status = 1
|
|
|
|
if status == 0:
|
|
print(f' ok: {len(de)} Schlüssel, deckungsgleich und vollständig')
|
|
sys.exit(status)
|
|
PY
|
|
}
|
|
|
|
case "$MODE" in
|
|
sync) do_sync ;;
|
|
install) install_if_needed ;;
|
|
check) do_check ;;
|
|
all) do_sync; install_if_needed; do_check ;;
|
|
esac
|