fix: restore dns config, Zoraxy admin, LE automation
This commit is contained in:
parent
49ac348694
commit
8366164155
2 changed files with 87 additions and 6 deletions
12
config/zoraxy/conf/proxy/dns.nextwks.eu.config
Normal file
12
config/zoraxy/conf/proxy/dns.nextwks.eu.config
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"ProxyType": 1,
|
||||||
|
"RootOrMatchingDomain": "dns.nextwks.eu",
|
||||||
|
"ActiveOrigins": [{
|
||||||
|
"OriginIpOrDomain": "127.0.0.1:8000",
|
||||||
|
"RequireTLS": false,
|
||||||
|
"Weight": 1,
|
||||||
|
"MaxConn": 0
|
||||||
|
}],
|
||||||
|
"Disabled": false,
|
||||||
|
"AuthenticationProvider": {"AuthMethod": 0}
|
||||||
|
}
|
||||||
81
deploy.sh
81
deploy.sh
|
|
@ -59,9 +59,9 @@ if [ "$GREENFIELD" = true ]; then
|
||||||
cp compose/zoraxy.yaml "$TARGET_DIR/compose/zoraxy.yaml"
|
cp compose/zoraxy.yaml "$TARGET_DIR/compose/zoraxy.yaml"
|
||||||
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" up -d 2>&1 || echo "[WARN] Zoraxy deploy had issues (see above)"
|
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" up -d 2>&1 || echo "[WARN] Zoraxy deploy had issues (see above)"
|
||||||
|
|
||||||
# Generate Zoraxy proxy config (single app.{domain} → binary, auth handled by binary)
|
# Generate Zoraxy proxy configs (both app and dns, AuthMethod 0 — binary handles auth for app)
|
||||||
echo "[*] Generating Zoraxy proxy config..."
|
echo "[*] Generating Zoraxy proxy configs..."
|
||||||
cat > "$TARGET_DIR/config/zoraxy/conf/proxy/app.$DOMAIN.config" <<ZORAXY_CFG
|
cat > "$TARGET_DIR/config/zoraxy/conf/proxy/app.$DOMAIN.config" <<ZORAXY_APP
|
||||||
{
|
{
|
||||||
"ProxyType": 1,
|
"ProxyType": 1,
|
||||||
"RootOrMatchingDomain": "app.$DOMAIN",
|
"RootOrMatchingDomain": "app.$DOMAIN",
|
||||||
|
|
@ -74,7 +74,22 @@ if [ "$GREENFIELD" = true ]; then
|
||||||
"Disabled": false,
|
"Disabled": false,
|
||||||
"AuthenticationProvider": {"AuthMethod": 0}
|
"AuthenticationProvider": {"AuthMethod": 0}
|
||||||
}
|
}
|
||||||
ZORAXY_CFG
|
ZORAXY_APP
|
||||||
|
|
||||||
|
cat > "$TARGET_DIR/config/zoraxy/conf/proxy/dns.$DOMAIN.config" <<ZORAXY_DNS
|
||||||
|
{
|
||||||
|
"ProxyType": 1,
|
||||||
|
"RootOrMatchingDomain": "dns.$DOMAIN",
|
||||||
|
"ActiveOrigins": [{
|
||||||
|
"OriginIpOrDomain": "127.0.0.1:8000",
|
||||||
|
"RequireTLS": false,
|
||||||
|
"Weight": 1,
|
||||||
|
"MaxConn": 0
|
||||||
|
}],
|
||||||
|
"Disabled": false,
|
||||||
|
"AuthenticationProvider": {"AuthMethod": 0}
|
||||||
|
}
|
||||||
|
ZORAXY_DNS
|
||||||
|
|
||||||
# Copy launcher config files
|
# Copy launcher config files
|
||||||
cp -r config/nextworkspace/* "$TARGET_DIR/config/nextworkspace/"
|
cp -r config/nextworkspace/* "$TARGET_DIR/config/nextworkspace/"
|
||||||
|
|
@ -125,8 +140,62 @@ apps:
|
||||||
icon: "admin"
|
icon: "admin"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Restart Zoraxy to pick up config
|
# Create Zoraxy admin account
|
||||||
echo "[*] Restarting Zoraxy to apply config..."
|
echo "[*] Creating Zoraxy admin account..."
|
||||||
|
ZORAXY_ADMIN_URL="http://127.0.0.1:8000/api/auth/register"
|
||||||
|
|
||||||
|
# Wait for Zoraxy to be ready
|
||||||
|
for i in $(seq 1 15); do
|
||||||
|
if curl -sf "http://127.0.0.1:8000/api/auth/userCount" > /dev/null 2>&1; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
echo " Waiting for Zoraxy... ($i/15)"
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
# Fetch CSRF token and create admin
|
||||||
|
COOKIE_JAR="/tmp/zoraxy_cookies.txt"
|
||||||
|
rm -f "$COOKIE_JAR"
|
||||||
|
LOGIN_PAGE=$(curl -sL -c "$COOKIE_JAR" http://127.0.0.1:8000/)
|
||||||
|
CSRF_TOKEN=$(echo "$LOGIN_PAGE" | grep -oP '(?<=<meta name="zoraxy.csrf.Token" content=")[^"]+' || echo "")
|
||||||
|
if [ -n "$CSRF_TOKEN" ]; then
|
||||||
|
ADMIN_CREATE=$(curl -s -b "$COOKIE_JAR" -X POST "$ZORAXY_ADMIN_URL" \
|
||||||
|
-H "X-CSRF-Token: $CSRF_TOKEN" \
|
||||||
|
-d "username=${ADMIN_USERNAME:-master}" \
|
||||||
|
-d "password=${ADMIN_PASSWORD:-9Aku7MfklZU9ldnZ}" 2>&1)
|
||||||
|
if echo "$ADMIN_CREATE" | grep -qi '"success"\|"ok"\|"registered'; then
|
||||||
|
echo "[OK] Zoraxy admin account created"
|
||||||
|
else
|
||||||
|
echo "[INFO] Admin API response: $ADMIN_CREATE"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Login to Zoraxy for LE config
|
||||||
|
LOGIN_PAGE=$(curl -sL -c "$COOKIE_JAR" http://127.0.0.1:8000/)
|
||||||
|
CSRF_TOKEN=$(echo "$LOGIN_PAGE" | grep -oP '(?<=<meta name="zoraxy.csrf.Token" content=")[^"]+' || echo "")
|
||||||
|
if [ -n "$CSRF_TOKEN" ]; then
|
||||||
|
curl -s -b "$COOKIE_JAR" -X POST "http://127.0.0.1:8000/api/auth/login" \
|
||||||
|
-H "X-CSRF-Token: $CSRF_TOKEN" \
|
||||||
|
-d "username=${ADMIN_USERNAME:-master}" \
|
||||||
|
-d "password=${ADMIN_PASSWORD:-9Aku7MfklZU9ldnZ}" > /dev/null
|
||||||
|
|
||||||
|
# Configure Let's Encrypt
|
||||||
|
echo "[*] Setting Let's Encrypt email..."
|
||||||
|
curl -s -b "$COOKIE_JAR" -X POST "http://127.0.0.1:8000/api/acme/autoRenew/email" \
|
||||||
|
-d "set=${TLS_EMAIL}" > /dev/null
|
||||||
|
|
||||||
|
echo "[*] Obtaining certificates for app.${DOMAIN}..."
|
||||||
|
curl -s -b "$COOKIE_JAR" -X GET "http://127.0.0.1:8000/api/acme/obtainCert" \
|
||||||
|
-G -d "domains=app.${DOMAIN}" -d "filename=app.${DOMAIN}" \
|
||||||
|
-d "email=${TLS_EMAIL}" -d "ca=Let's Encrypt" -d "dns=false" > /dev/null || true
|
||||||
|
|
||||||
|
echo "[*] Enabling auto-renew..."
|
||||||
|
curl -s -b "$COOKIE_JAR" -X POST "http://127.0.0.1:8000/api/acme/autoRenew/enable" \
|
||||||
|
-d "enable=true" > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Restart Zoraxy to pick up configs
|
||||||
|
echo "[*] Restarting Zoraxy to apply configs..."
|
||||||
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" restart 2>&1 || true
|
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" restart 2>&1 || true
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue