fix code conflicts and match dev change

server/lib/traefik/getTraefikConfig.ts

@@ -15,6 +15,7 @@ import config from "@server/lib/config";
 import { resources, sites, Target, targets } from "@server/db";
 import createPathRewriteMiddleware from "./middleware";
 import { sanitize, validatePathRewriteConfig } from "./utils";
+import { privateConfig } from "../../private/lib/config";
 
 const redirectHttpsMiddlewareName = "redirect-to-https";
 const badgerMiddlewareName = "badger";
@@ -253,6 +254,10 @@ export async function getTraefikConfig(
             const domainCertResolver = resource.domainCertResolver;
             const preferWildcardCert = resource.preferWildcardCert;
 
+
+            let tls = {};
+            if (!privateConfig.getRawPrivateConfig().flags.generate_own_certificates) {
+
                 let resolverName: string | undefined;
                 let preferWildcard: boolean | undefined;
                 // Handle both letsencrypt & custom cases
@@ -271,8 +276,7 @@ export async function getTraefikConfig(
                     preferWildcard = globalDefaultPreferWildcard;
                 }
 
-            let tls = {};
+
-            if (build == "oss") {
                 tls = {
                     certResolver: resolverName,
                     ...(preferWildcard

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: [