diff --git a/VERSION b/VERSION index efa2a7c..b8ea701 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0.0001 +0.1.0.0000 diff --git a/deploy.sh b/deploy.sh index 34768be..94be546 100755 --- a/deploy.sh +++ b/deploy.sh @@ -191,21 +191,26 @@ EOF for SUB in $APP_SUB $DNS_SUB $WWW_SUB; do FQDN="${SUB}.${DOMAIN}" CRT_FILE="$CERTS_DIR/${FQDN}.crt" - [ -f "$CRT_FILE" ] || continue + if [ ! -f "$CRT_FILE" ]; then echo " SKIP $FQDN (no file)"; continue; fi + echo " Uploading $FQDN..." for TRY in 1 2 3; do rm -f /tmp/zc.txt PAGE=$(curl -s --max-time 5 -c /tmp/zc.txt "http://127.0.0.1:8000/login.html" 2>&1) TOKEN=$(echo "$PAGE" | grep 'zoraxy.csrf.Token' | sed 's/.*content="//;s/".*//') - [ -z "$TOKEN" ] && sleep 2 && continue + if [ -z "$TOKEN" ]; then + echo " Retry $TRY: no CSRF token" + sleep 2; continue + fi R=$(curl -s --max-time 5 -b /tmp/zc.txt -X POST \ -H "X-CSRF-Token: $TOKEN" \ -H "Referer: http://127.0.0.1:8000/login.html" \ "http://127.0.0.1:8000/api/cert/upload?ktype=pub&domain=$FQDN" \ --data-binary "@$CRT_FILE" 2>&1) || true if echo "$R" | grep -qi '"success"\|"ok"\|^{}$'; then - echo " [OK] Cert registered: $FQDN" + echo " [OK] $FQDN registered" break fi + echo " Retry $TRY: $(echo $R | head -c 60)" sleep 2 done done @@ -334,4 +339,7 @@ for i in $(seq 1 $HEALTH_CHECK_RETRIES); do done echo "[FAIL] Health check failed — launcher did not respond on port 9000" +echo "[DEBUG] Checking systemd service status..." +systemctl status $SERVICE_NAME --no-pager 2>&1 | head -10 || true +journalctl -u $SERVICE_NAME --no-pager -n 10 2>&1 || true exit 1