From 8f9609d0c18fedd815560c7d809840fa4fa86bba Mon Sep 17 00:00:00 2001
From: William Harrison <william@williamdavidharrison.com.au>
Date: Wed, 16 Oct 2024 17:48:45 +0800
Subject: [PATCH] Update dnsconfig.js

---
 dnsconfig.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/dnsconfig.js b/dnsconfig.js
index f053b8b4b..6a71add4f 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -46,13 +46,6 @@ for (var idx in domains) {
     proxyState = proxy.off;
   }
 
-  // Handle CNAME record
-  if (domainData.record.CNAME) {
-    commit[domainData.record.domain].push(
-      CNAME(domainData.subdomain, domainData.record.CNAME + ".", proxyState)
-    );
-  }
-
   // Handle A records
   if (domainData.record.A) {
     for (var a in domainData.record.A) {
@@ -71,27 +64,27 @@ for (var idx in domains) {
     }
   }
 
+  // Handle CNAME record
+  if (domainData.record.CNAME) {
+    commit[domainData.record.domain].push(
+      CNAME(domainData.subdomain, `${domainData.record.CNAME}.`, proxyState)
+    );
+  }
+
   // Handle MX records
   if (domainData.record.MX) {
     for (var mx in domainData.record.MX) {
       commit[domainData.record.domain].push(
-        MX(domainData.subdomain, 10, domainData.record.MX[mx] + ".")
+        MX(domainData.subdomain, 10, `${domainData.record.MX[mx]}.`)
       );
     }
   }
 
-  // Handle URL records (redirect)
-  if (domainData.record.URL) {
-    commit[domainData.record.domain].push(
-      URL(domainData.subdomain, domainData.record.URL)
-    );
-  }
-
   // Handle NS records
   if (domainData.record.NS) {
     for (var ns in domainData.record.NS) {
       commit[domainData.domain].push(
-        NS(domainData.subdomain, domainData.record.NS[ns] + ".")
+        NS(domainData.subdomain, `${domainData.record.NS[ns]}.`)
       );
     }
   }
@@ -101,7 +94,7 @@ for (var idx in domains) {
     for (var srv in domainData.record.SRV) {
       var srvRecord = domainData.record.SRV[srv];
       commit[domainData.domain].push(
-        SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")
+        SRV(domainData.subdomain, srvRecord.priority, srvRecord.weight, srvRecord.port, `${srvRecord.target}.`)
       );
     }
   }
@@ -120,6 +113,13 @@ for (var idx in domains) {
       );
     }
   }
+
+  // Handle URL records (redirect)
+  if (domainData.record.URL) {
+    commit[domainData.record.domain].push(
+      CNAME(domainData.subdomain, "redirect.is-a.dev.", proxyState)
+    );
+  }
 }
 
 // Commit all DNS records