Merge pull request #2936 from fosrl/dev

1.18.1 patch over

server/lib/billing/tierMatrix.ts

@@ -64,7 +64,7 @@ export const tierMatrix: Record<TierFeature, Tier[]> = {
     [TierFeature.SIEM]: ["enterprise"],
     [TierFeature.HTTPPrivateResources]: ["tier3", "enterprise"],
     [TierFeature.DomainNamespaces]: ["tier1", "tier2", "tier3", "enterprise"],
-    [TierFeature.StandaloneHealthChecks]: ["tier2", "tier3", "enterprise"],
-    [TierFeature.AlertingRules]: ["tier2", "tier3", "enterprise"],
+    [TierFeature.StandaloneHealthChecks]: ["tier3", "enterprise"],
+    [TierFeature.AlertingRules]: ["tier3", "enterprise"],
     [TierFeature.WildcardSubdomain]: ["tier1", "tier2", "tier3", "enterprise"]
 };

server/private/lib/acmeCertSync.ts

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

src/components/ClientResourcesTable.tsx

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

src/components/ProxyResourcesTable.tsx

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