pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-14 17:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy in config to db, remove 2nd column, + prefer

Browse Source
This commit is contained in:
Owen
2025-10-08 14:43:24 -07:00
committed by Pallavi Kumari
parent d6681733dd
commit d938345deb
9 changed files with 103 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,6 @@ export async function getTraefikConfig(
// Certificate
certificateStatus: certificates.status,
domainCertResolver: domains.certResolver,
domainCustomCertResolver: domains.customCertResolver
})
.from(sites)
.innerJoin(targets, eq(targets.siteId, sites.siteId))
@@ -206,7 +205,6 @@ export async function getTraefikConfig(
rewritePathType: row.rewritePathType,
priority: priority, // may be null, we fallback later
domainCertResolver: row.domainCertResolver,
domainCustomCertResolver: row.domainCustomCertResolver
});
}
@@ -306,29 +304,6 @@ export async function getTraefikConfig(
wildCard = resource.fullDomain;
}
const configDomain = config.getDomain(resource.domainId);
const rawTraefikCfg = config.getRawConfig().traefik || {};
const globalDefaultResolver = rawTraefikCfg.cert_resolver;
const domainCertResolver =
resource.domainCertResolver ?? configDomain?.cert_resolver;
const domainCustomResolver =
resource.domainCustomCertResolver;
const preferWildcardCert =
resource.preferWildcardCert ?? configDomain?.prefer_wildcard_cert ?? false;
let resolverName: string | undefined;
// Handle both letsencrypt & custom cases
if (domainCertResolver === "custom") {
resolverName = domainCustomResolver?.trim();
} else if (domainCertResolver) {
resolverName = domainCertResolver;
} else {
resolverName = globalDefaultResolver;
}
let tls = {};
if (!privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {
const domainParts = fullDomain.split(".");