Update migration and peers
This commit is contained in:
parent
1f686ba9fe
commit
275beab907
2 changed files with 16 additions and 8 deletions
|
|
@ -9,6 +9,7 @@ if [ "$EUID" -eq 0 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
sudo chown -R "$USER:$USER" "$SCRIPT_DIR" 2>/dev/null || true
|
||||||
OPERATOR_DIR="$HOME/operator-docker"
|
OPERATOR_DIR="$HOME/operator-docker"
|
||||||
BACKUP_DIR="$HOME/.wg-migration"
|
BACKUP_DIR="$HOME/.wg-migration"
|
||||||
LOG="$BACKUP_DIR/migration.log"
|
LOG="$BACKUP_DIR/migration.log"
|
||||||
|
|
@ -20,6 +21,8 @@ if [ -f "$OPERATOR_DIR/lib/ui.sh" ]; then
|
||||||
source "$OPERATOR_DIR/lib/ui.sh"
|
source "$OPERATOR_DIR/lib/ui.sh"
|
||||||
source "$OPERATOR_DIR/lib/log.sh"
|
source "$OPERATOR_DIR/lib/log.sh"
|
||||||
source "$OPERATOR_DIR/lib/steps.sh"
|
source "$OPERATOR_DIR/lib/steps.sh"
|
||||||
|
|
||||||
|
fail() { log_error "$1"; exit 1; }
|
||||||
else
|
else
|
||||||
RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; CYAN='\033[0;36m'; RESET='\033[0m'
|
RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; CYAN='\033[0;36m'; RESET='\033[0m'
|
||||||
ok() { echo -e "${GREEN}[OK]${RESET} $1"; [ -f "$LOG" ] && echo "[OK] $1" >> "$LOG"; }
|
ok() { echo -e "${GREEN}[OK]${RESET} $1"; [ -f "$LOG" ] && echo "[OK] $1" >> "$LOG"; }
|
||||||
|
|
@ -76,7 +79,9 @@ if [ -f "$OPERATOR_DIR/lib/ui.sh" ]; then
|
||||||
source "$OPERATOR_DIR/lib/ui.sh"
|
source "$OPERATOR_DIR/lib/ui.sh"
|
||||||
source "$OPERATOR_DIR/lib/log.sh"
|
source "$OPERATOR_DIR/lib/log.sh"
|
||||||
source "$OPERATOR_DIR/lib/steps.sh"
|
source "$OPERATOR_DIR/lib/steps.sh"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
fail() { log_error "$1"; exit 1; }
|
||||||
|
|
||||||
# ─── STEP 2: Backup & cleanup (needs root) ────────────────────────────────────
|
# ─── STEP 2: Backup & cleanup (needs root) ────────────────────────────────────
|
||||||
print_section "Step 2/$TOTAL_STEPS — Backup & cleanup"
|
print_section "Step 2/$TOTAL_STEPS — Backup & cleanup"
|
||||||
|
|
|
||||||
|
|
@ -195,14 +195,17 @@ ok "Existing users will reconnect automatically."
|
||||||
# ─── VERIFY API ───────────────────────────────────────────────────────────────
|
# ─── VERIFY API ───────────────────────────────────────────────────────────────
|
||||||
sep
|
sep
|
||||||
info "Verifying API..."
|
info "Verifying API..."
|
||||||
for i in $(seq 1 10); do
|
DEADLINE=$(( $(date +%s) + 180 ))
|
||||||
HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --max-time 10 \
|
i=0
|
||||||
-H "Authorization: Bearer $API_TOKEN" \
|
while [ $(date +%s) -lt $DEADLINE ]; do
|
||||||
"$API_URL/wireguard/peers" 2>/dev/null || echo "000")
|
HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --max-time 10 \
|
||||||
[ "$HTTP_CODE" = "200" ] && break
|
-H "Authorization: Bearer $API_TOKEN" \
|
||||||
warn "API not ready (HTTP $HTTP_CODE) — retry $i/10..."
|
"$API_URL/wireguard/peers" 2>/dev/null || echo "000")
|
||||||
sleep 5
|
[ "$HTTP_CODE" = "200" ] && break
|
||||||
done
|
i=$(( i + 1 ))
|
||||||
|
warn "API not ready (HTTP $HTTP_CODE) — waited ${i}x5s..."
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
[ "$HTTP_CODE" = "200" ] || fail "API not responding after retries (HTTP $HTTP_CODE)."
|
[ "$HTTP_CODE" = "200" ] || fail "API not responding after retries (HTTP $HTTP_CODE)."
|
||||||
ok "API responding."
|
ok "API responding."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue