Merge pull request #2570 from Fizza-Mukhtar/fix/mixed-target-failover-2448

fix: local targets ignored when newt site is unhealthy (mixed target failover)

server/lib/traefik/getTraefikConfig.ts

@@ -477,7 +477,10 @@ export async function getTraefikConfig(
 
                         // TODO: HOW TO HANDLE ^^^^^^ BETTER
                         const anySitesOnline = targets.some(
-                            (target) => target.site.online
+                            (target) =>
+                            target.site.online ||
+                            target.site.type === "local" ||
+                            target.site.type === "wireguard"
                         );
 
                         return (
@@ -490,7 +493,7 @@ export async function getTraefikConfig(
                                     if (target.health == "unhealthy") {
                                         return false;
                                     }
-
+                                    
                                     // If any sites are online, exclude offline sites
                                     if (anySitesOnline && !target.site.online) {
                                         return false;
@@ -605,7 +608,10 @@ export async function getTraefikConfig(
                     servers: (() => {
                         // Check if any sites are online
                         const anySitesOnline = targets.some(
-                            (target) => target.site.online
+                            (target) =>
+                            target.site.online ||
+                            target.site.type === "local" ||
+                            target.site.type === "wireguard"
                         );
 
                         return targets
@@ -613,7 +619,7 @@ export async function getTraefikConfig(
                                 if (!target.enabled) {
                                     return false;
                                 }
-
+                                
                                 // If any sites are online, exclude offline sites
                                 if (anySitesOnline && !target.site.online) {
                                     return false;

server/private/lib/traefik/getTraefikConfig.ts

@@ -665,7 +665,10 @@ export async function getTraefikConfig(
 
                         // TODO: HOW TO HANDLE ^^^^^^ BETTER
                         const anySitesOnline = targets.some(
-                            (target) => target.site.online
+                            (target) =>
+                            target.site.online ||
+                            target.site.type === "local" ||
+                            target.site.type === "wireguard"
                         );
 
                         return (
@@ -793,7 +796,10 @@ export async function getTraefikConfig(
                     servers: (() => {
                         // Check if any sites are online
                         const anySitesOnline = targets.some(
-                            (target) => target.site.online
+                            (target) =>
+                            target.site.online ||
+                            target.site.type === "local" ||
+                            target.site.type === "wireguard"
                         );
 
                         return targets

src/components/ContainersSelector.tsx

@@ -171,8 +171,7 @@ const DockerContainersTable: FC<{
                 ...Object.values(container.networks)
                     .map((n) => n.ipAddress)
                     .filter(Boolean),
-                ...getExposedPorts(container).map((p) => p.toString()),
+                ...getExposedPorts(container).map((p) => p.toString())
-                ...Object.entries(container.labels).flat()
             ];
 
             return searchableFields.some((field) =>

src/components/newt-install-commands.tsx

@@ -101,6 +101,7 @@ export function NewtSiteInstallCommands({
                 `helm install newt fossorial/newt \\
     --create-namespace \\
     --set newtInstances[0].name="main-tunnel" \\
+    --set newtInstances[0].enabled=true \\
     --set-string newtInstances[0].auth.keys.endpointKey="${endpoint}" \\
     --set-string newtInstances[0].auth.keys.idKey="${id}" \\
     --set-string newtInstances[0].auth.keys.secretKey="${secret}"`
@@ -185,59 +186,72 @@ WantedBy=default.target`
                     className="mt-4"
                 />
 
-                    <div className="pt-4">
+                <div className="pt-4">
-                        <p className="font-bold mb-3">
+                    <p className="font-bold mb-3">{t("siteConfiguration")}</p>
-                            {t("siteConfiguration")}
+                    <div className="flex items-center space-x-2 mb-2">
-                        </p>
+                        <CheckboxWithLabel
-                        <div className="flex items-center space-x-2 mb-2">
+                            id="acceptClients"
-                            <CheckboxWithLabel
+                            aria-describedby="acceptClients-desc"
-                                id="acceptClients"
+                            checked={acceptClients}
-                                aria-describedby="acceptClients-desc"
+                            onCheckedChange={(checked) => {
-                                checked={acceptClients}
+                                const value = checked as boolean;
-                                onCheckedChange={(checked) => {
+                                setAcceptClients(value);
-                                    const value = checked as boolean;
+                            }}
-                                    setAcceptClients(value);
+                            label={t("siteAcceptClientConnections")}
-                                }}
+                        />
-                                label={t("siteAcceptClientConnections")}
-                            />
-                        </div>
-                        <p
-                            id="acceptClients-desc"
-                            className="text-sm text-muted-foreground"
-                        >
-                            {t("siteAcceptClientConnectionsDescription")}
-                        </p>
                     </div>
+                    <p
+                        id="acceptClients-desc"
+                        className="text-sm text-muted-foreground"
+                    >
+                        {t("siteAcceptClientConnectionsDescription")}
+                    </p>
+                </div>
 
-                    <div className="pt-4">
+                <div className="pt-4">
-                        <p className="font-bold mb-3">{t("commands")}</p>
+                    <p className="font-bold mb-3">{t("commands")}</p>
-                        <div className="mt-2 space-y-3">
+                    {platform === "kubernetes" && (
-                            {commands.map((item, index) => {
+                        <p className="text-sm text-muted-foreground mb-3">
-                                const commandText =
+                            For more and up to date Kubernetes installation
-                                    typeof item === "string"
+                            information, see{" "}
-                                        ? item
+                            <a
-                                        : item.command;
+                                href="https://docs.pangolin.net/manage/sites/install-kubernetes"
-                                const title =
+                                target="_blank"
-                                    typeof item === "string"
+                                rel="noreferrer"
-                                        ? undefined
+                                className="underline"
-                                        : item.title;
+                            >
+                                docs.pangolin.net/manage/sites/install-kubernetes
+                            </a>
+                            .
+                        </p>
+                    )}
+                    <div className="mt-2 space-y-3">
+                        {commands.map((item, index) => {
+                            const commandText =
+                                typeof item === "string" ? item : item.command;
+                            const title =
+                                typeof item === "string"
+                                    ? undefined
+                                    : item.title;
 
-                                return (
+                            const key = `${title ?? ""}::${commandText}`;
-                                    <div key={index}>
+
-                                        {title && (
+                            return (
-                                            <p className="text-sm font-medium mb-1.5">
+                                <div key={key}>
-                                                {title}
+                                    {title && (
-                                            </p>
+                                        <p className="text-sm font-medium mb-1.5">
-                                        )}
+                                            {title}
-                                        <CopyTextBox
+                                        </p>
-                                            text={commandText}
+                                    )}
-                                            outline={true}
+                                    <CopyTextBox
-                                        />
+                                        text={commandText}
-                                    </div>
+                                        outline={true}
-                                );
+                                    />
-                            })}
+                                </div>
-                        </div>
+                            );
+                        })}
                     </div>
+                </div>
             </SettingsSectionBody>
         </SettingsSection>
     );