Hide cname and ns if not using dns

server/lib/traefik/TraefikConfigManager.ts

@@ -310,7 +310,7 @@ export class TraefikConfigManager {
             }
 
             if (
-                process.env.GENERATE_OWN_CERTIFICATES === "true" &&
+                process.env.USE_PANGOLIN_DNS === "true" &&
                 build != "oss"
             ) {
                 // Scan current local certificate state

server/private/lib/readConfigFile.ts

@@ -83,7 +83,7 @@ export const privateConfigSchema = z.object({
     flags: z
         .object({
             enable_redis: z.boolean().optional().default(false),
-            generate_own_certificates: z.boolean().optional().default(false)
+            use_pangolin_dns: z.boolean().optional().default(false)
         })
         .optional()
         .default({}),

server/private/lib/traefik/getTraefikConfig.ts

@@ -234,7 +234,7 @@ export async function getTraefikConfig(
             }
 
             // TODO: for now dont filter it out because if you have multiple domain ids and one is failed it causes all of them to fail
-            // if (resource.certificateStatus !== "valid" && privateConfig.getRawPrivateConfig().flags.generate_own_certificates) {
+            // if (resource.certificateStatus !== "valid" && privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {
             //     logger.debug(
             //         `Resource ${resource.resourceId} has certificate stats ${resource.certificateStats}`
             //     );
@@ -267,7 +267,7 @@ export async function getTraefikConfig(
             let tls = {};
             if (
                 !privateConfig.getRawPrivateConfig().flags
-                    .generate_own_certificates
+                    .use_pangolin_dns
             ) {
                 let certResolver: string, preferWildcardCert: boolean;
                 if (!configDomain) {

server/private/routers/certificates/createCertificate.ts

@@ -27,7 +27,7 @@ export async function createCertificate(
     domain: string,
     trx: Transaction | typeof db
 ) {
-    if (!privateConfig.getRawPrivateConfig().flags.generate_own_certificates) {
+    if (!privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {
         return;
     }
 

src/components/CreateDomainForm.tsx

@@ -119,6 +119,7 @@ export default function CreateDomainForm({
     const t = useTranslations();
     const { toast } = useToast();
     const { org } = useOrgContext();
+    const { env } = useEnvContext();
 
     const form = useForm<FormValues>({
         resolver: zodResolver(formSchema),
@@ -169,7 +170,7 @@ export default function CreateDomainForm({
     }, [domainInputValue]);
 
     let domainOptions: any = [];
-    if (build == "enterprise" || build == "saas") {
+    if (build != "oss" && env.flags.usePangolinDns) {
         domainOptions = [
             {
                 id: "ns",
@@ -182,7 +183,7 @@ export default function CreateDomainForm({
                 description: t("selectDomainTypeCnameDescription")
             }
         ];
-    } else if (build == "oss") {
+    } else {
         domainOptions = [
             {
                 id: "wildcard",
@@ -559,8 +560,7 @@ export default function CreateDomainForm({
                                     )}
                             </div>
 
-                            {build == "saas" ||
-                                (build == "enterprise" && (
+                            {build != "oss" && env.flags.usePangolinDns && (
                                     <Alert variant="destructive">
                                         <AlertTriangle className="h-4 w-4" />
                                         <AlertTitle className="font-semibold">
@@ -572,7 +572,7 @@ export default function CreateDomainForm({
                                             )}
                                         </AlertDescription>
                                     </Alert>
-                                ))}
+                                )}
 
                             <Alert variant="info">
                                 <AlertTriangle className="h-4 w-4" />

src/lib/pullEnv.ts

@@ -49,8 +49,8 @@ export function pullEnv(): Env {
                 process.env.FLAGS_ENABLE_CLIENTS === "true" ? true : false,
             hideSupporterKey:
                 process.env.HIDE_SUPPORTER_KEY === "true" ? true : false,
-            generateOwnCertificates:
-                process.env.GENERATE_OWN_CERTIFICATES === "true"
+            usePangolinDns:
+                process.env.USE_PANGOLIN_DNS === "true"
                     ? true
                     : false
         },

src/lib/types/env.ts

@@ -28,7 +28,7 @@ export type Env = {
         disableBasicWireguardSites: boolean;
         enableClients: boolean;
         hideSupporterKey: boolean;
-        generateOwnCertificates: boolean;
+        usePangolinDns: boolean;
     },
     branding: {
         appName?: string;