calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-22 08:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2936 from fosrl/dev

Browse Source 
1.18.1 patch over
This commit is contained in:
Owen Schwartz
2026-04-29 16:43:06 -07:00
committed by GitHub
parent 269bd9aa0f 81197f8a86
commit 79541ec7b8
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/private/lib/acmeCertSync.ts
View File

@@ -405,7 +405,8 @@ async function syncAcmeCerts(acmeJsonPath: string): Promise<void> {
existing[0].certFile, existing[0].certFile,
config.getRawConfig().server.secret! config.getRawConfig().server.secret!
); );
if (storedCertPem === certPem) { const wildcardUnchanged = existing[0].wildcard === wildcard;
if (storedCertPem === certPem && wildcardUnchanged) {
// logger.debug( // logger.debug(
// `acmeCertSync: cert for ${domain} is unchanged, skipping` // `acmeCertSync: cert for ${domain} is unchanged, skipping`
// ); // );

2
src/components/ClientResourcesTable.tsx
View File

@@ -52,6 +52,7 @@ import {
type ResourceSiteRow type ResourceSiteRow
} from "@app/components/ResourceSitesStatusCell"; } from "@app/components/ResourceSitesStatusCell";
import { ResourceAccessCertIndicator } from "@app/components/ResourceAccessCertIndicator"; import { ResourceAccessCertIndicator } from "@app/components/ResourceAccessCertIndicator";
import { build } from "@server/build";
export type InternalResourceSiteRow = ResourceSiteRow; export type InternalResourceSiteRow = ResourceSiteRow;
@@ -445,6 +446,7 @@ export default function ClientResourcesTable({
const fullDomain = resourceRow.fullDomain; const fullDomain = resourceRow.fullDomain;
const url = `${resourceRow.ssl ? "https" : "http"}://${fullDomain}`; const url = `${resourceRow.ssl ? "https" : "http"}://${fullDomain}`;
const did = const did =
build !== "oss" &&
resourceRow.ssl && resourceRow.ssl &&
domainId != null && domainId != null &&
domainId !== "" && domainId !== "" &&

2
src/components/ProxyResourcesTable.tsx
View File

@@ -65,6 +65,7 @@ import { ColumnFilterButton } from "./ColumnFilterButton";
import { ControlledDataTable } from "./ui/controlled-data-table"; import { ControlledDataTable } from "./ui/controlled-data-table";
import UptimeMiniBar from "./UptimeMiniBar"; import UptimeMiniBar from "./UptimeMiniBar";
import { ResourceAccessCertIndicator } from "@app/components/ResourceAccessCertIndicator"; import { ResourceAccessCertIndicator } from "@app/components/ResourceAccessCertIndicator";
import { build } from "@server/build";
export type TargetHealth = { export type TargetHealth = {
targetId: number; targetId: number;
@@ -554,6 +555,7 @@ export default function ProxyResourcesTable({
const domainId = resourceRow.domainId; const domainId = resourceRow.domainId;
const certHostname = resourceRow.fullDomain; const certHostname = resourceRow.fullDomain;
const showHttpsCertIndicator = const showHttpsCertIndicator =
build !== "oss" &&
resourceRow.ssl && resourceRow.ssl &&
certHostname != null && certHostname != null &&
certHostname !== ""; certHostname !== "";