From 4416f157970889992cfd9a95e129552c046bc3ee Mon Sep 17 00:00:00 2001
From: cclohmar <claus.lohmar@lohmar.co.uk>
Date: Tue, 7 Jul 2026 09:53:29 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20Zoraxy=20config=20expansion=20=E2=80=94?=
 =?UTF-8?q?=20use=20full=20schema=20with=20origin=20IP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 89 insertions(+), 15 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 11be125..202bc26 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -73,20 +73,57 @@ if [ "$GREENFIELD" = true ]; then
     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)"
 
-    # Generate Zoraxy proxy configs (both app and dns, AuthMethod 0 — binary handles auth for app)
+    # Generate Zoraxy proxy configs with full schema (prevents Zoraxy from clearing OriginIpOrDomain on expand)
     echo "[*] Generating Zoraxy proxy configs..."
     cat > "$TARGET_DIR/config/zoraxy/conf/proxy/app.$DOMAIN.config" <<ZORAXY_APP
 {
     "ProxyType": 1,
     "RootOrMatchingDomain": "app.$DOMAIN",
-    "ActiveOrigins": [{
-        "OriginIpOrDomain": "127.0.0.1:9000",
-        "RequireTLS": false,
-        "Weight": 1,
-        "MaxConn": 0
-    }],
+    "MatchingDomainAlias": [],
+    "ActiveOrigins": [
+        {
+            "OriginIpOrDomain": "127.0.0.1:9000",
+            "RequireTLS": false,
+            "SkipCertValidations": false,
+            "SkipWebSocketOriginCheck": false,
+            "Weight": 1,
+            "MaxConn": 0,
+            "RespTimeout": 0
+        }
+    ],
+    "InactiveOrigins": [],
+    "UseStickySession": false,
+    "UseActiveLoadBalance": false,
     "Disabled": false,
-    "AuthenticationProvider": {"AuthMethod": 0}
+    "BypassGlobalTLS": false,
+    "VirtualDirectories": [],
+    "HeaderRewriteRules": {
+        "UserDefinedHeaders": null,
+        "RequestHostOverwrite": "",
+        "HSTSMaxAge": 0,
+        "EnablePermissionPolicyHeader": false,
+        "PermissionPolicy": null,
+        "DisableHopByHopHeaderRemoval": false
+    },
+    "EnableWebsocketCustomHeaders": false,
+    "AuthenticationProvider": {
+        "AuthMethod": 0,
+        "BasicAuthCredentials": null,
+        "BasicAuthExceptionRules": null,
+        "BasicAuthGroupIDs": [],
+        "ForwardAuthURL": "",
+        "ForwardAuthResponseHeaders": [],
+        "ForwardAuthResponseClientHeaders": [],
+        "ForwardAuthRequestHeaders": [],
+        "ForwardAuthRequestExcludedCookies": []
+    },
+    "RequireRateLimit": false,
+    "RateLimit": 0,
+    "DisableUptimeMonitor": false,
+    "AccessFilterUUID": "",
+    "DefaultSiteOption": 0,
+    "DefaultSiteValue": "",
+    "Tags": []
 }
 ZORAXY_APP
 
@@ -94,14 +131,51 @@ ZORAXY_APP
 {
     "ProxyType": 1,
     "RootOrMatchingDomain": "dns.$DOMAIN",
-    "ActiveOrigins": [{
-        "OriginIpOrDomain": "127.0.0.1:8000",
-        "RequireTLS": false,
-        "Weight": 1,
-        "MaxConn": 0
-    }],
+    "MatchingDomainAlias": [],
+    "ActiveOrigins": [
+        {
+            "OriginIpOrDomain": "127.0.0.1:8000",
+            "RequireTLS": false,
+            "SkipCertValidations": false,
+            "SkipWebSocketOriginCheck": false,
+            "Weight": 1,
+            "MaxConn": 0,
+            "RespTimeout": 0
+        }
+    ],
+    "InactiveOrigins": [],
+    "UseStickySession": false,
+    "UseActiveLoadBalance": false,
     "Disabled": false,
-    "AuthenticationProvider": {"AuthMethod": 0}
+    "BypassGlobalTLS": false,
+    "VirtualDirectories": [],
+    "HeaderRewriteRules": {
+        "UserDefinedHeaders": null,
+        "RequestHostOverwrite": "",
+        "HSTSMaxAge": 0,
+        "EnablePermissionPolicyHeader": false,
+        "PermissionPolicy": null,
+        "DisableHopByHopHeaderRemoval": false
+    },
+    "EnableWebsocketCustomHeaders": false,
+    "AuthenticationProvider": {
+        "AuthMethod": 0,
+        "BasicAuthCredentials": null,
+        "BasicAuthExceptionRules": null,
+        "BasicAuthGroupIDs": [],
+        "ForwardAuthURL": "",
+        "ForwardAuthResponseHeaders": [],
+        "ForwardAuthResponseClientHeaders": [],
+        "ForwardAuthRequestHeaders": [],
+        "ForwardAuthRequestExcludedCookies": []
+    },
+    "RequireRateLimit": false,
+    "RateLimit": 0,
+    "DisableUptimeMonitor": false,
+    "AccessFilterUUID": "",
+    "DefaultSiteOption": 0,
+    "DefaultSiteValue": "",
+    "Tags": []
 }
 ZORAXY_DNS