pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-05 10:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: qiery perferWildcardCert from db

Browse Source 
Fixes #1816
Fixes #1829
This commit is contained in:
Owen
2025-11-08 14:13:43 -08:00
parent b83ec1b503
commit a776b2ea94
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/lib/traefik/getTraefikConfig.ts
View File

@@ -80,7 +80,8 @@ export async function getTraefikConfig(
subnet: sites.subnet, subnet: sites.subnet,
exitNodeId: sites.exitNodeId, exitNodeId: sites.exitNodeId,
// Domain cert resolver fields // Domain cert resolver fields
domainCertResolver: domains.certResolver domainCertResolver: domains.certResolver,
preferWildcardCert: domains.preferWildcardCert
}) })
.from(sites) .from(sites)
.innerJoin(targets, eq(targets.siteId, sites.siteId)) .innerJoin(targets, eq(targets.siteId, sites.siteId))
@@ -178,7 +179,8 @@ export async function getTraefikConfig(
rewritePathType: row.rewritePathType, rewritePathType: row.rewritePathType,
priority: priority, priority: priority,
// Store domain cert resolver fields // Store domain cert resolver fields
domainCertResolver: row.domainCertResolver domainCertResolver: row.domainCertResolver,
preferWildcardCert: row.preferWildcardCert
}); });
} }

6
server/private/lib/traefik/getTraefikConfig.ts
View File

@@ -111,7 +111,8 @@ export async function getTraefikConfig(
domainNamespaceId: domainNamespaces.domainNamespaceId, domainNamespaceId: domainNamespaces.domainNamespaceId,
// Certificate // Certificate
certificateStatus: certificates.status, certificateStatus: certificates.status,
domainCertResolver: domains.certResolver domainCertResolver: domains.certResolver,
preferWildcardCert: domains.preferWildcardCert
}) })
.from(sites) .from(sites)
.innerJoin(targets, eq(targets.siteId, sites.siteId)) .innerJoin(targets, eq(targets.siteId, sites.siteId))
@@ -218,7 +219,8 @@ export async function getTraefikConfig(
rewritePath: row.rewritePath, rewritePath: row.rewritePath,
rewritePathType: row.rewritePathType, rewritePathType: row.rewritePathType,
priority: priority, // may be null, we fallback later priority: priority, // may be null, we fallback later
domainCertResolver: row.domainCertResolver domainCertResolver: row.domainCertResolver,
preferWildcardCert: row.preferWildcardCert
}); });
} }