const

README.md

@@ -16,7 +16,7 @@ _Pangolin tunnels your services to the internet so you can access anything from
 
 <div align="center">
   <h5>
-      <a href="https://fossorial.io">
+      <a href="https://digpangolin.com">
         Website
       </a>
       <span> | </span>
@@ -111,7 +111,7 @@ Host the full application on your own server or on the cloud with a VPS. Take a
 
 ### Pangolin Cloud
 
-Easy to use with simple [pay as you go pricing](https://fossorial.io/pricing). [Check it out here](https://pangolin.fossorial.io/auth/signup). 
+Easy to use with simple [pay as you go pricing](https://digpangolin.io/pricing). [Check it out here](https://pangolin.fossorial.io/auth/signup). 
 
 - Everything you get with self hosted Pangolin, but fully managed for you.
 

messages/en-US.json

@@ -1266,6 +1266,7 @@
     "createDomainName": "Name:",
     "createDomainValue": "Value:",
     "createDomainCnameRecords": "CNAME Records",
+    "createDomainARecords": "A Records",
     "createDomainRecordNumber": "Record {number}",
     "createDomainTxtRecords": "TXT Records",
     "createDomainSaveTheseRecords": "Save These Records",

server/lib/readConfigFile.ts

@@ -128,7 +128,9 @@ export const configSchema = z
             .object({
                 http_entrypoint: z.string().optional().default("web"),
                 https_entrypoint: z.string().optional().default("websecure"),
-                additional_middlewares: z.array(z.string()).optional()
+                additional_middlewares: z.array(z.string()).optional(),
+                cert_resolver: z.string().optional().default("letsencrypt"),
+                prefer_wildcard_cert: z.boolean().optional().default(false)
             })
             .optional()
             .default({}),
@@ -157,10 +159,13 @@ export const configSchema = z
             })
             .optional()
             .default({}),
-        orgs: z.object({
+        orgs: z
+            .object({
                 block_size: z.number().positive().gt(0).optional().default(24),
                 subnet_group: z.string().optional().default("100.90.128.0/24")
-        }).optional().default({
+            })
+            .optional()
+            .default({
                 block_size: 24,
                 subnet_group: "100.90.128.0/24"
             }),
@@ -242,7 +247,7 @@ export const configSchema = z
         {
             message: "At least one domain must be defined"
         }
-    )
+    );
 
 export function readConfigFile() {
     const loadConfig = (configPath: string) => {

server/routers/domain/createOrgDomain.ts

@@ -29,6 +29,7 @@ export type CreateDomainResponse = {
     domainId: string;
     nsRecords?: string[];
     cnameRecords?: { baseDomain: string; value: string }[];
+    aRecords?: { baseDomain: string; value: string }[];
     txtRecords?: { baseDomain: string; value: string }[];
 };
 
@@ -97,6 +98,7 @@ export async function createOrgDomain(
         }
 
         let numOrgDomains: OrgDomains[] | undefined;
+        let aRecords: CreateDomainResponse["aRecords"];
         let cnameRecords: CreateDomainResponse["cnameRecords"];
         let txtRecords: CreateDomainResponse["txtRecords"];
         let nsRecords: CreateDomainResponse["nsRecords"];
@@ -239,7 +241,7 @@ export async function createOrgDomain(
                     }
                 ];
             } else if (type === "wildcard") {
-                cnameRecords = [
+                aRecords = [
                     {
                         value: `Server IP Address`,
                         baseDomain: `*.${baseDomain}`
@@ -271,7 +273,8 @@ export async function createOrgDomain(
                 domainId: returned.domainId,
                 cnameRecords,
                 txtRecords,
-                nsRecords
+                nsRecords,
+                aRecords
             },
             success: true,
             error: false,

server/routers/traefik/getTraefikConfig.ts

@@ -214,11 +214,19 @@ export async function traefikConfigProvider(
 
                 const configDomain = config.getDomain(resource.domainId);
 
-                let tls = {};
+                let certResolver: string, preferWildcardCert: boolean;
-                if (configDomain) {
+                if (!configDomain) {
-                    tls = {
+                    certResolver = config.getRawConfig().traefik.cert_resolver;
-                        certResolver: configDomain.cert_resolver,
+                    preferWildcardCert =
-                        ...(configDomain.prefer_wildcard_cert
+                        config.getRawConfig().traefik.prefer_wildcard_cert;
+                } else {
+                    certResolver = configDomain.cert_resolver;
+                    preferWildcardCert = configDomain.prefer_wildcard_cert;
+                }
+
+                const tls = {
+                    certResolver: certResolver,
+                    ...(preferWildcardCert
                         ? {
                               domains: [
                                   {
@@ -228,7 +236,6 @@ export async function traefikConfigProvider(
                           }
                         : {})
                 };
-                }
 
                 const additionalMiddlewares =
                     config.getRawConfig().traefik.additional_middlewares || [];

src/app/[orgId]/settings/domains/CreateDomainForm.tsx

@@ -205,8 +205,8 @@ export default function CreateDomainForm({
                             </Alert>
 
                             <div className="space-y-4">
-                                {domainType === "ns" &&
+                                {createdDomain.nsRecords &&
-                                    createdDomain.nsRecords && (
+                                createdDomain.nsRecords.length > 0 && (
                                     <div>
                                         <h3 className="font-medium mb-3">
                                             {t("createDomainNsRecords")}
@@ -220,7 +220,9 @@ export default function CreateDomainForm({
                                                     <div className="space-y-2">
                                                         <div className="flex justify-between items-center">
                                                             <span className="text-sm font-medium">
-                                                                    {t("createDomainType")}
+                                                                {t(
+                                                                    "createDomainType"
+                                                                )}
                                                             </span>
                                                             <span className="text-sm font-mono">
                                                                 NS
@@ -228,14 +230,18 @@ export default function CreateDomainForm({
                                                         </div>
                                                         <div className="flex justify-between items-center">
                                                             <span className="text-sm font-medium">
-                                                                    {t("createDomainName")}
+                                                                {t(
+                                                                    "createDomainName"
+                                                                )}
                                                             </span>
                                                             <span className="text-sm font-mono">
                                                                 {baseDomain}
                                                             </span>
                                                         </div>
                                                         <span className="text-sm font-medium">
-                                                                {t("createDomainValue")}
+                                                            {t(
+                                                                "createDomainValue"
+                                                            )}
                                                         </span>
                                                         {createdDomain.nsRecords.map(
                                                             (
@@ -244,9 +250,7 @@ export default function CreateDomainForm({
                                                             ) => (
                                                                 <div
                                                                     className="flex justify-between items-center"
-                                                                        key={
+                                                                    key={index}
-                                                                            index
-                                                                        }
                                                                 >
                                                                     <CopyToClipboard
                                                                         text={
@@ -263,35 +267,35 @@ export default function CreateDomainForm({
                                     </div>
                                 )}
 
-                                {domainType === "cname" ||
-                                    (domainType == "wildcard" && (
-                                        <>
                                 {createdDomain.cnameRecords &&
-                                                createdDomain.cnameRecords
+                                    createdDomain.cnameRecords.length > 0 && (
-                                                    .length > 0 && (
                                         <div>
                                             <h3 className="font-medium mb-3">
                                                 {t("createDomainCnameRecords")}
                                             </h3>
                                             <InfoSections cols={1}>
                                                 {createdDomain.cnameRecords.map(
-                                                                (
+                                                    (cnameRecord, index) => (
-                                                                    cnameRecord,
-                                                                    index
-                                                                ) => (
                                                         <InfoSection
-                                                                        key={
+                                                            key={index}
-                                                                            index
-                                                                        }
                                                         >
                                                             <InfoSectionTitle>
-                                                                        {t("createDomainRecordNumber", { number: index + 1 })}
+                                                                {t(
+                                                                    "createDomainRecordNumber",
+                                                                    {
+                                                                        number:
+                                                                            index +
+                                                                            1
+                                                                    }
+                                                                )}
                                                             </InfoSectionTitle>
                                                             <InfoSectionContent>
                                                                 <div className="space-y-2">
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainType")}
+                                                                            {t(
+                                                                                "createDomainType"
+                                                                            )}
                                                                         </span>
                                                                         <span className="text-sm font-mono">
                                                                             CNAME
@@ -299,7 +303,9 @@ export default function CreateDomainForm({
                                                                     </div>
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainName")}
+                                                                            {t(
+                                                                                "createDomainName"
+                                                                            )}
                                                                         </span>
                                                                         <span className="text-sm font-mono">
                                                                             {
@@ -309,7 +315,9 @@ export default function CreateDomainForm({
                                                                     </div>
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainValue")}
+                                                                            {t(
+                                                                                "createDomainValue"
+                                                                            )}
                                                                         </span>
                                                                         <CopyToClipboard
                                                                             text={
@@ -326,32 +334,101 @@ export default function CreateDomainForm({
                                         </div>
                                     )}
 
+                                {createdDomain.aRecords &&
+                                    createdDomain.aRecords.length > 0 && (
+                                        <div>
+                                            <h3 className="font-medium mb-3">
+                                                {t("createDomainARecords")}
+                                            </h3>
+                                            <InfoSections cols={1}>
+                                                {createdDomain.aRecords.map(
+                                                    (aRecord, index) => (
+                                                        <InfoSection
+                                                            key={index}
+                                                        >
+                                                            <InfoSectionTitle>
+                                                                {t(
+                                                                    "createDomainRecordNumber",
+                                                                    {
+                                                                        number:
+                                                                            index +
+                                                                            1
+                                                                    }
+                                                                )}
+                                                            </InfoSectionTitle>
+                                                            <InfoSectionContent>
+                                                                <div className="space-y-2">
+                                                                    <div className="flex justify-between items-center">
+                                                                        <span className="text-sm font-medium">
+                                                                            {t(
+                                                                                "createDomainType"
+                                                                            )}
+                                                                        </span>
+                                                                        <span className="text-sm font-mono">
+                                                                            A
+                                                                        </span>
+                                                                    </div>
+                                                                    <div className="flex justify-between items-center">
+                                                                        <span className="text-sm font-medium">
+                                                                            {t(
+                                                                                "createDomainName"
+                                                                            )}
+                                                                        </span>
+                                                                        <span className="text-sm font-mono">
+                                                                            {
+                                                                                aRecord.baseDomain
+                                                                            }
+                                                                        </span>
+                                                                    </div>
+                                                                    <div className="flex justify-between items-center">
+                                                                        <span className="text-sm font-medium">
+                                                                            {t(
+                                                                                "createDomainValue"
+                                                                            )}
+                                                                        </span>
+                                                                        <span className="text-sm font-mono">
+                                                                            {
+                                                                                aRecord.value
+                                                                            }
+                                                                       </span>
+                                                                    </div>
+                                                                </div>
+                                                            </InfoSectionContent>
+                                                        </InfoSection>
+                                                    )
+                                                )}
+                                            </InfoSections>
+                                        </div>
+                                    )}
                                 {createdDomain.txtRecords &&
-                                                createdDomain.txtRecords
+                                    createdDomain.txtRecords.length > 0 && (
-                                                    .length > 0 && (
                                         <div>
                                             <h3 className="font-medium mb-3">
                                                 {t("createDomainTxtRecords")}
                                             </h3>
                                             <InfoSections cols={1}>
                                                 {createdDomain.txtRecords.map(
-                                                                (
+                                                    (txtRecord, index) => (
-                                                                    txtRecord,
-                                                                    index
-                                                                ) => (
                                                         <InfoSection
-                                                                        key={
+                                                            key={index}
-                                                                            index
-                                                                        }
                                                         >
                                                             <InfoSectionTitle>
-                                                                        {t("createDomainRecordNumber", { number: index + 1 })}
+                                                                {t(
+                                                                    "createDomainRecordNumber",
+                                                                    {
+                                                                        number:
+                                                                            index +
+                                                                            1
+                                                                    }
+                                                                )}
                                                             </InfoSectionTitle>
                                                             <InfoSectionContent>
                                                                 <div className="space-y-2">
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainType")}
+                                                                            {t(
+                                                                                "createDomainType"
+                                                                            )}
                                                                         </span>
                                                                         <span className="text-sm font-mono">
                                                                             TXT
@@ -359,7 +436,9 @@ export default function CreateDomainForm({
                                                                     </div>
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainName")}
+                                                                            {t(
+                                                                                "createDomainName"
+                                                                            )}
                                                                         </span>
                                                                         <span className="text-sm font-mono">
                                                                             {
@@ -369,7 +448,9 @@ export default function CreateDomainForm({
                                                                     </div>
                                                                     <div className="flex justify-between items-center">
                                                                         <span className="text-sm font-medium">
-                                                                                        {t("createDomainValue")}
+                                                                            {t(
+                                                                                "createDomainValue"
+                                                                            )}
                                                                         </span>
                                                                         <CopyToClipboard
                                                                             text={
@@ -385,8 +466,6 @@ export default function CreateDomainForm({
                                             </InfoSections>
                                         </div>
                                     )}
-                                        </>
-                                    ))}
                             </div>
 
                             {build == "saas" ||
@@ -397,7 +476,9 @@ export default function CreateDomainForm({
                                             {t("createDomainSaveTheseRecords")}
                                         </AlertTitle>
                                         <AlertDescription>
-                                            {t("createDomainSaveTheseRecordsDescription")}
+                                            {t(
+                                                "createDomainSaveTheseRecordsDescription"
+                                            )}
                                         </AlertDescription>
                                     </Alert>
                                 ))}