lexton-it/NextWks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: write BoltDB before Zoraxy starts (db not locked) + remove duplicate

Browse source
This commit is contained in:
Claus Lohmar 2026-07-07 16:47:27 +01:00
parent fa9537bcb5
commit e03cb76017
1 changed files with 30 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
deploy.sh
View file

@ -133,7 +133,34 @@ if [ "$GREENFIELD" = true ]; then
echo "[INFO] Version: $(cat $TARGET_DIR/VERSION)" echo "[INFO] Version: $(cat $TARGET_DIR/VERSION)"
fi fi
# Deploy Zoraxy (remove old container first to avoid name conflict) # Write configs before starting Zoraxy (BoltDB must not be locked)
echo "[*] Writing configuration files..."
# Write ACME config
mkdir -p "$TARGET_DIR/config/zoraxy/conf"
cat > "$TARGET_DIR/config/zoraxy/conf/acme_conf.json" <<EOF
{
"Enabled": true,
"Email": "${TLS_EMAIL}",
"RenewAll": true,
"FilesToRenew": [],
"DNSServers": ""
}
EOF
# Write admin + ZorxAuth to BoltDB (Zoraxy not running, db not locked)
if [ -f "$TOOL_BIN" ]; then
# Create the data directory and an empty database
mkdir -p "$TARGET_DIR/data/zoraxy"
touch "$TARGET_DIR/data/zoraxy/sys.db"
"$TOOL_BIN" db --db "$TARGET_DIR/data/zoraxy/sys.db" \
--set "system:admin:{\"username\":\"${ADMIN_USERNAME:-master}\"}" 2>&1 || true
"$TOOL_BIN" db --db "$TARGET_DIR/data/zoraxy/sys.db" \
--set "zorxauth:options:{\"enable_auth_gateway\":true,\"sso_redirect_url\":\"https://app.${DOMAIN}/\"}" 2>&1 || true
echo " [OK] Admin + ZorxAuth written to BoltDB"
fi
# Deploy Zoraxy
cp compose/zoraxy.yaml "$TARGET_DIR/compose/zoraxy.yaml" cp compose/zoraxy.yaml "$TARGET_DIR/compose/zoraxy.yaml"
podman rm -f zoraxy 2>/dev/null || true podman rm -f zoraxy 2>/dev/null || true
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" up -d 2>&1 || echo "[WARN] Zoraxy deploy had issues" podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" up -d 2>&1 || echo "[WARN] Zoraxy deploy had issues"
@ -254,48 +281,8 @@ apps:
icon: "admin" icon: "admin"
EOF EOF
# Configure Zoraxy via BoltDB + config files (no CSRF-prone API calls) # All Zoraxy config (ACME, BoltDB) already written before Zoraxy started
echo "[*] Configuring Zoraxy..." echo "[*] Zoraxy configuration complete"
SYS_DB="$TARGET_DIR/data/zoraxy/sys.db"
# Wait for Zoraxy to create the database (or timeout)
for i in $(seq 1 30); do
if [ -f "$SYS_DB" ]; then break; fi
if curl -sf "http://127.0.0.1:8000/api/auth/userCount" > /dev/null 2>&1; then
# Zoraxy is up, create db file if it doesn't exist yet
touch "$SYS_DB" 2>/dev/null || true
break
fi
sleep 2
done
# Write admin user directly to BoltDB via helper tool
if [ -f "$SYS_DB" ] && [ -f "$TOOL_BIN" ]; then
"$TOOL_BIN" db --db "$SYS_DB" \
--set "system:admin:{\"username\":\"${ADMIN_USERNAME:-master}\"}" 2>&1 || true
"$TOOL_BIN" db --db "$SYS_DB" \
--set "zorxauth:options:{\"enable_auth_gateway\":true,\"sso_redirect_url\":\"https://app.${DOMAIN}/\"}" 2>&1 || true
echo " [OK] Admin + ZorxAuth written to BoltDB"
else
echo " [WARN] Could not write to BoltDB (sys.db or tool missing)"
fi
# Write ACME config file directly
mkdir -p "$TARGET_DIR/config/zoraxy/conf"
cat > "$TARGET_DIR/config/zoraxy/conf/acme_conf.json" <<EOF
{
"Enabled": true,
"Email": "${TLS_EMAIL}",
"RenewAll": true,
"FilesToRenew": [],
"DNSServers": ""
}
EOF
echo " [OK] ACME enabled (email: ${TLS_EMAIL})"
# Restart Zoraxy to pick up configs
podman-compose -f "$TARGET_DIR/compose/zoraxy.yaml" restart 2>&1 || true
sleep 2
# Write systemd service # Write systemd service
echo "[*] Writing systemd service..." echo "[*] Writing systemd service..."