fix code conflicts and match dev change

2026-02-23 05:16:38 +00:00 · 2025-10-15 19:38:09 +05:30
parent df24525105
commit 156fe529b5
2 changed files with 46 additions and 40 deletions
--- a/server/private/lib/traefik/getTraefikConfig.ts
+++ b/server/private/lib/traefik/getTraefikConfig.ts
@@ -304,6 +304,8 @@ export async function getTraefikConfig(
                wildCard = resource.fullDomain;
            }

+            const configDomain = config.getDomain(resource.domainId);
+
            let tls = {};
            if (!privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {
                const domainParts = fullDomain.split(".");
@@ -331,7 +333,7 @@ export async function getTraefikConfig(
                }

                tls = {
-                    certResolver: resolverName,
+                    certResolver: certResolver,
                    ...(preferWildcardCert
                        ? {
                            domains: [