From 1f1d3d7e0f6910a08267d3c6ccf78fd807453776 Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Thu, 15 Oct 2026 12:01:31 -0400
Subject: [PATCH] fix merge

---
 server/lib/traefik/loadBalancer.test.ts | 9 ---------
 server/lib/traefik/loadBalancer.ts      | 4 ++--
 server/lib/traefik/types.ts             | 2 ++
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/server/lib/traefik/loadBalancer.test.ts b/server/lib/traefik/loadBalancer.test.ts
index 2adb5f040..011f6a000 100644
--- a/server/lib/traefik/loadBalancer.test.ts
+++ b/server/lib/traefik/loadBalancer.test.ts
@@ -11,21 +11,12 @@ function makeTarget(ip: string, siteType: string): TargetWithSite {
     return {
         targetId: 1,
         resourceId: 1,
-        providerId: null,
-        siteId: 1,
         ip,
         port: 8080,
         internalPort: 9000,
         method: "http",
         enabled: true,
         health: "healthy",
-        path: null,
-        pathMatchType: null,
-        rewritePath: null,
-        rewritePathType: null,
-        priority: 100,
-        mode: "http",
-        authToken: null,
         site: {
             siteId: 1,
             type: siteType,
diff --git a/server/lib/traefik/loadBalancer.ts b/server/lib/traefik/loadBalancer.ts
index 365756b37..8af343989 100644
--- a/server/lib/traefik/loadBalancer.ts
+++ b/server/lib/traefik/loadBalancer.ts
@@ -49,7 +49,7 @@ export function buildHttpLoadBalancerServers(targets: TargetWithSite[]) {
                 target.site.type === "wireguard"
             ) {
                 return {
-                    url: `${target.method}://${formatEndpoint(target.ip, target.port)}`
+                    url: `${target.method}://${formatEndpoint(target.ip!, target.port!)}`
                 };
             } else if (target.site.type === "newt") {
                 const ip = target.site.subnet!.split("/")[0];
@@ -124,7 +124,7 @@ export function buildTcpUdpLoadBalancerServers(targets: TargetWithSite[]) {
                 target.site.type === "wireguard"
             ) {
                 return {
-                    address: formatEndpoint(target.ip, target.port)
+                    address: formatEndpoint(target.ip!, target.port!)
                 };
             } else if (target.site.type === "newt") {
                 const ip = target.site.subnet!.split("/")[0];
diff --git a/server/lib/traefik/types.ts b/server/lib/traefik/types.ts
index e6a552d9c..cec77aad6 100644
--- a/server/lib/traefik/types.ts
+++ b/server/lib/traefik/types.ts
@@ -33,6 +33,8 @@ export type ResourceWithTargets = Pick<
     | "domainId"
     | "enabled"
     | "stickySession"
+    | "loadBalancingStrategy"
+    | "mtlsEnabled"
     | "tlsServerName"
     | "setHostHeader"
     | "enableProxy"