From 6fd6c77ce6f049bcba442059a7462e8ed34b6f06 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 21 Oct 2025 11:29:27 -0700 Subject: [PATCH] Further revert --- server/lib/traefik/getTraefikConfig.ts | 6 +++++- server/private/lib/traefik/getTraefikConfig.ts | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/lib/traefik/getTraefikConfig.ts b/server/lib/traefik/getTraefikConfig.ts index 6a013114..5916d026 100644 --- a/server/lib/traefik/getTraefikConfig.ts +++ b/server/lib/traefik/getTraefikConfig.ts @@ -90,7 +90,11 @@ export async function getTraefikConfig( eq(resources.enabled, true), or( eq(sites.exitNodeId, exitNodeId), - and(isNull(sites.exitNodeId), eq(sites.type, "local")) + and( + isNull(sites.exitNodeId), + sql`(${siteTypes.includes("local") ? 1 : 0} = 1)`, // only allow local sites if "local" is in siteTypes + eq(sites.type, "local") + ) ), or( ne(targetHealthCheck.hcHealth, "unhealthy"), // Exclude unhealthy targets diff --git a/server/private/lib/traefik/getTraefikConfig.ts b/server/private/lib/traefik/getTraefikConfig.ts index 2ee3f774..31421b9d 100644 --- a/server/private/lib/traefik/getTraefikConfig.ts +++ b/server/private/lib/traefik/getTraefikConfig.ts @@ -124,9 +124,8 @@ export async function getTraefikConfig( or( eq(sites.exitNodeId, exitNodeId), and( - build != "saas" // so it runs in enterprise - ? isNull(sites.exitNodeId) - : sql`0 = 1`, + isNull(sites.exitNodeId), + sql`(${siteTypes.includes("local") ? 1 : 0} = 1)`, // only allow local sites if "local" is in siteTypes eq(sites.type, "local") ) ),