Dont include site resources on the cloud

This commit is contained in:
Owen
2026-04-29 14:08:42 -07:00
parent e173f59d89
commit 2ffe254879

View File

@@ -277,37 +277,37 @@ export async function getTraefikConfig(
}); });
}); });
// Query siteResources in HTTP mode with SSL enabled and aliases - cert generation / HTTPS edge let siteResourcesWithFullDomain: {
const siteResourcesWithFullDomain = await db siteResourceId: number;
.select({ fullDomain: string | null;
siteResourceId: siteResources.siteResourceId, mode: "http" | "host" | "cidr";
fullDomain: siteResources.fullDomain, }[] = [];
mode: siteResources.mode if (build == "enterprise") {
}) // we dont want to do this on the cloud
.from(siteResources) // Query siteResources in HTTP mode with SSL enabled and aliases - cert generation / HTTPS edge
.innerJoin( siteResourcesWithFullDomain = await db
siteNetworks, .select({
eq(siteResources.networkId, siteNetworks.networkId) siteResourceId: siteResources.siteResourceId,
) fullDomain: siteResources.fullDomain,
.innerJoin(sites, eq(siteNetworks.siteId, sites.siteId)) mode: siteResources.mode
.where( })
and( .from(siteResources)
eq(siteResources.enabled, true), .innerJoin(
isNotNull(siteResources.fullDomain), siteNetworks,
eq(siteResources.mode, "http"), eq(siteResources.networkId, siteNetworks.networkId)
eq(siteResources.ssl, true),
or(
eq(sites.exitNodeId, exitNodeId),
and(
isNull(sites.exitNodeId),
sql`(${siteTypes.includes("local") ? 1 : 0} = 1)`,
eq(sites.type, "local"),
sql`(${build != "saas" ? 1 : 0} = 1)`
)
),
inArray(sites.type, siteTypes)
) )
); .innerJoin(sites, eq(siteNetworks.siteId, sites.siteId))
.where(
and(
eq(siteResources.enabled, true),
isNotNull(siteResources.fullDomain),
eq(siteResources.mode, "http"),
eq(siteResources.ssl, true),
eq(sites.exitNodeId, exitNodeId),
inArray(sites.type, siteTypes)
)
);
}
let validCerts: CertificateResult[] = []; let validCerts: CertificateResult[] = [];
if (privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) { if (privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {