diff --git a/deploy-matrix-v3.sh b/deploy-matrix-v3.sh index aeee4dd..73efd19 100755 --- a/deploy-matrix-v3.sh +++ b/deploy-matrix-v3.sh @@ -52,7 +52,7 @@ pg() { pct exec "$CT_PG" -- "$@"; } # Хелпер: забэкапить файл, если существует backup_file() { local f=$1 - ct test -f "$f" || return 0 + ct bash -c "test -f $f" || return 0 local bak="$f.bak-$(date +%Y%m%d-%H%M%S)" ct cp "$f" "$bak" info " Бэкап: $bak" @@ -62,7 +62,7 @@ backup_file() { [[ $EUID -eq 0 ]] || error "Запускать от root" pct status "$CT_ID" &>/dev/null || error "CT $CT_ID не найден" pct status "$CT_PG" &>/dev/null || error "CT $CT_PG (Postgres) не найден" -ct command -v docker &>/dev/null || error "Docker не установлен в CT $CT_ID" +ct bash -c "command -v docker" &>/dev/null || error "Docker не установлен в CT $CT_ID" info "=== Matrix deploy v2 ===" info "Synapse/Coturn: CT $CT_ID ($CT_IP)" @@ -127,7 +127,7 @@ setup_synapse_coturn() { local HS="$DATA_DIR/homeserver.yaml" local TURN_CONF="$CONFIG_GEN/turnserver.conf" - if ct test -f "$HS"; then + if ct bash -c "test -f $HS"; then OIDC_ID=$(ct grep -E 'client_id:' "$HS" | head -1 | sed -E 's/.*client_id:\s*"?([^"]+)"?.*/\1/') OIDC_SECRET=$(ct grep -E 'client_secret:' "$HS" | head -1 | sed -E 's/.*client_secret:\s*"?([^"]+)"?.*/\1/') info " OIDC credentials из $HS" @@ -137,7 +137,7 @@ setup_synapse_coturn() { fi [[ -n "$OIDC_ID" && -n "$OIDC_SECRET" ]] || error "OIDC credentials пустые" - if ct test -f "$TURN_CONF"; then + if ct bash -c "test -f $TURN_CONF"; then TURN_SECRET=$(ct grep '^static-auth-secret=' "$TURN_CONF" | cut -d= -f2) info " TURN_SECRET из $TURN_CONF" else @@ -146,7 +146,7 @@ setup_synapse_coturn() { fi [[ -n "$TURN_SECRET" ]] || error "TURN_SECRET пустой" - if ct test -f "$HS"; then + if ct bash -c "test -f $HS"; then REG_SECRET=$(ct grep -E '^registration_shared_secret:' "$HS" | sed -E 's/.*:\s*"?([^"]+)"?.*/\1/') MAC_SECRET=$(ct grep -E '^macaroon_secret_key:' "$HS" | sed -E 's/.*:\s*"?([^"]+)"?.*/\1/') FORM_SECRET=$(ct grep -E '^form_secret:' "$HS" | sed -E 's/.*:\s*"?([^"]+)"?.*/\1/') @@ -158,7 +158,7 @@ setup_synapse_coturn() { info " Synapse secrets сгенерированы" fi - if ! ct test -f "$DATA_DIR/$DOMAIN.signing.key"; then + if ! ct bash -c "test -f $DATA_DIR/$DOMAIN.signing.key"; then info " Генерация signing key..." ct bash -c "docker run --rm -e SYNAPSE_SERVER_NAME=$DOMAIN -e SYNAPSE_REPORT_STATS=no -v $DATA_DIR:/data matrixdotorg/synapse:latest generate 2>&1 | tail -3" else @@ -253,7 +253,7 @@ YAMLEOF info " homeserver.yaml записан" # --- log_config --- - if ! ct test -f "$DATA_DIR/$DOMAIN.log.config"; then + if ! ct bash -c "test -f $DATA_DIR/$DOMAIN.log.config"; then ct bash -c "docker run --rm --entrypoint cat matrixdotorg/synapse:latest /usr/local/lib/python3.12/site-packages/synapse/resources/log_config.yaml > $DATA_DIR/$DOMAIN.log.config 2>/dev/null || \ docker run --rm --entrypoint cat matrixdotorg/synapse:latest /usr/local/lib/python3.13/site-packages/synapse/resources/log_config.yaml > $DATA_DIR/$DOMAIN.log.config" info " log_config создан" @@ -368,7 +368,7 @@ setup_livekit() { local LK_CONF="$LIVEKIT_DIR/livekit.yaml" backup_file "$LK_CONF" - if ct test -f "$LK_CONF"; then + if ct bash -c "test -f $LK_CONF"; then info " livekit.yaml уже есть (не трогаем)" else info " Генерируем livekit.yaml (ключи: devkey/secret123)"