Merge pull request #16641 from is-a-dev/wdhdev-patch-1

Update dnsconfig.js

dnsconfig.js

@@ -2,16 +2,16 @@ var regNone = NewRegistrar("none");
 var providerCf = DnsProvider(NewDnsProvider("cloudflare"));
 
 var proxy = {
-    on: { "cloudflare_proxy": "on" },
+    off: { cloudflare_proxy: "off" },
-    off: { "cloudflare_proxy": "off" }
+    on: { cloudflare_proxy: "on" }
 }
 
 function getDomainsList(filesPath) {
     var result = [];
-    var files = glob.apply(null, [filesPath, true, '.json']);
+    var files = glob.apply(null, [filesPath, true, ".json"]);
 
     for (var i = 0; i < files.length; i++) {
-        var name = files[i].split('/').pop().replace(/\.json$/, '');
+        var name = files[i].split("/").pop().replace(/\.json$/, "");
 
         result.push({ name: name, data: require(files[i]) });
     }
@@ -19,33 +19,27 @@ function getDomainsList(filesPath) {
     return result;
 }
 
-var domains = getDomainsList('./domains');
+var domains = getDomainsList("./domains");
-var commit = {};
+var commit = [];
 
 for (var idx in domains) {
-    var domainName = "is-a.dev";
     var subdomainName = domains[idx].name;
     var domainData = domains[idx].data;
-    var proxyState = proxy.on; // enabled by default
+    var proxyState = proxy.off; // disabled by default
 
-    if (!commit[domainName]) commit[domainName] = [];
+    if (domainData.proxied) proxyState = proxy.on;
-    if (!domainData.proxied) proxyState = proxy.off;
 
     // Handle A records
     if (domainData.record.A) {
         for (var a in domainData.record.A) {
-            commit[domainName].push(
+            commit.push(A(subdomainName, IP(domainData.record.A[a]), proxyState));
-                A(subdomainName, IP(domainData.record.A[a]), proxyState)
-            );
         }
     }
 
     // Handle AAAA records
     if (domainData.record.AAAA) {
         for (var aaaa in domainData.record.AAAA) {
-            commit[domainName].push(
+            commit.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState));
-                AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState)
-            );
         }
     }
 
@@ -53,34 +47,26 @@ for (var idx in domains) {
     if (domainData.record.CAA) {
         for (var caa in domainData.record.CAA) {
             var caaRecord = domainData.record.CAA[caa];
-            commit[domainName].push(
+            commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value));
-                CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)
-            );
         }
     }
 
     // Handle CNAME records
     if (domainData.record.CNAME) {
-        commit[domainName].push(
+        commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState));
-            CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)
-        );
     }
 
     // Handle MX records
     if (domainData.record.MX) {
         for (var mx in domainData.record.MX) {
-            commit[domainName].push(
+            commit.push(MX(subdomainName, 10, domainData.record.MX[mx] + "."));
-                MX(subdomainName, 10, domainData.record.MX[mx] + ".")
-            );
         }
     }
 
     // Handle NS records
     if (domainData.record.NS) {
         for (var ns in domainData.record.NS) {
-            commit[domainName].push(
+            commit.push(NS(subdomainName, domainData.record.NS[ns] + "."));
-                NS(subdomainName, domainData.record.NS[ns] + ".")
-            );
         }
     }
 
@@ -88,9 +74,7 @@ for (var idx in domains) {
     if (domainData.record.SRV) {
         for (var srv in domainData.record.SRV) {
             var srvRecord = domainData.record.SRV[srv];
-            commit[domainName].push(
+            commit.push(SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + "."));
-                SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")
-            );
         }
     }
 
@@ -98,21 +82,16 @@ for (var idx in domains) {
     if (domainData.record.TXT) {
         if (Array.isArray(domainData.record.TXT)) {
             for (var txt in domainData.record.TXT) {
-                commit[domainName].push(
+                commit.push(TXT(subdomainName, domainData.record.TXT[txt]));
-                    TXT(subdomainName, domainData.record.TXT[txt])
-                );
             }
         } else {
-            commit[domainName].push(
+            commit.push(TXT(subdomainName, domainData.record.TXT));
-                TXT(subdomainName, domainData.record.TXT)
-            );
         }
     }
 
     // Handle URL records
-    // Note: URL records are not actual DNS records, we have a server configured to support them instead.
     if (domainData.record.URL) {
-        commit[domainName].push(
+        commit.push(
             A(subdomainName, "45.85.238.5", proxy.on),
             TXT("_redirect." + subdomainName, "v=txtv0;type=host;to=" + domainData.record.URL)
         );
@@ -120,6 +99,4 @@ for (var idx in domains) {
 }
 
 // Commit all DNS records
-for (var domainName in commit) {
+D("is-a.dev", regNone, providerCf, commit);
-    D(domainName, regNone, providerCf, commit[domainName]);
-}