fix: verbose cert upload + health check debug
This commit is contained in:
parent
dea385a71c
commit
5d30facbcc
2 changed files with 12 additions and 4 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
0.1.0.0001
|
0.1.0.0000
|
||||||
|
|
|
||||||
14
deploy.sh
14
deploy.sh
|
|
@ -191,21 +191,26 @@ EOF
|
||||||
for SUB in $APP_SUB $DNS_SUB $WWW_SUB; do
|
for SUB in $APP_SUB $DNS_SUB $WWW_SUB; do
|
||||||
FQDN="${SUB}.${DOMAIN}"
|
FQDN="${SUB}.${DOMAIN}"
|
||||||
CRT_FILE="$CERTS_DIR/${FQDN}.crt"
|
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
|
for TRY in 1 2 3; do
|
||||||
rm -f /tmp/zc.txt
|
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)
|
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/".*//')
|
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 \
|
R=$(curl -s --max-time 5 -b /tmp/zc.txt -X POST \
|
||||||
-H "X-CSRF-Token: $TOKEN" \
|
-H "X-CSRF-Token: $TOKEN" \
|
||||||
-H "Referer: http://127.0.0.1:8000/login.html" \
|
-H "Referer: http://127.0.0.1:8000/login.html" \
|
||||||
"http://127.0.0.1:8000/api/cert/upload?ktype=pub&domain=$FQDN" \
|
"http://127.0.0.1:8000/api/cert/upload?ktype=pub&domain=$FQDN" \
|
||||||
--data-binary "@$CRT_FILE" 2>&1) || true
|
--data-binary "@$CRT_FILE" 2>&1) || true
|
||||||
if echo "$R" | grep -qi '"success"\|"ok"\|^{}$'; then
|
if echo "$R" | grep -qi '"success"\|"ok"\|^{}$'; then
|
||||||
echo " [OK] Cert registered: $FQDN"
|
echo " [OK] $FQDN registered"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
|
echo " Retry $TRY: $(echo $R | head -c 60)"
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
@ -334,4 +339,7 @@ for i in $(seq 1 $HEALTH_CHECK_RETRIES); do
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "[FAIL] Health check failed — launcher did not respond on port 9000"
|
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
|
exit 1
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue