From a9707d15615dfc8574a59357531b48a4d4fef378 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Fri, 18 Oct 2024 09:30:34 +0800 Subject: [PATCH 1/2] Update dnsconfig.js --- dnsconfig.js | 61 ++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index f22a4219a..c4afb4f44 100644 --- a/dnsconfig.js +++ b/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 commit = {}; +var domains = getDomainsList("./domains"); +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.off; + if (domainData.proxied) proxyState = proxy.on; // Handle A records if (domainData.record.A) { for (var a in domainData.record.A) { - commit[domainName].push( - A(subdomainName, IP(domainData.record.A[a]), proxyState) - ); + commit.push(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( - AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState) - ); + commit.push(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( - CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value) - ); + commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)); } } // Handle CNAME records if (domainData.record.CNAME) { - commit[domainName].push( - CNAME(subdomainName, domainData.record.CNAME + ".", proxyState) - ); + commit.push(CNAME(subdomainName, `${domainData.record.CNAME}.`, proxyState)); } // Handle MX records if (domainData.record.MX) { for (var mx in domainData.record.MX) { - commit[domainName].push( - MX(subdomainName, 10, domainData.record.MX[mx] + ".") - ); + commit.push(MX(subdomainName, 10, `${domainData.record.MX[mx]}.`)); } } // Handle NS records if (domainData.record.NS) { for (var ns in domainData.record.NS) { - commit[domainName].push( - NS(subdomainName, domainData.record.NS[ns] + ".") - ); + commit.push(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( - SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".") - ); + commit.push(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( - TXT(subdomainName, domainData.record.TXT[txt]) - ); + commit.push(TXT(subdomainName, domainData.record.TXT[txt])); } } else { - commit[domainName].push( - TXT(subdomainName, domainData.record.TXT) - ); + commit.push(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(domainName, regNone, providerCf, commit[domainName]); -} +D("is-a.dev", regNone, providerCf, commit); From e65dcefa28665e1a2bace17385cb63ea81c74b46 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Fri, 18 Oct 2024 09:34:34 +0800 Subject: [PATCH 2/2] Update dnsconfig.js --- dnsconfig.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index c4afb4f44..a3f6d0cbd 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -53,20 +53,20 @@ for (var idx in domains) { // Handle CNAME records if (domainData.record.CNAME) { - commit.push(CNAME(subdomainName, `${domainData.record.CNAME}.`, proxyState)); + commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); } // Handle MX records if (domainData.record.MX) { for (var mx in domainData.record.MX) { - commit.push(MX(subdomainName, 10, `${domainData.record.MX[mx]}.`)); + commit.push(MX(subdomainName, 10, domainData.record.MX[mx] + ".")); } } // Handle NS records if (domainData.record.NS) { for (var ns in domainData.record.NS) { - commit.push(NS(subdomainName, `${domainData.record.NS[ns]}.`)); + commit.push(NS(subdomainName, domainData.record.NS[ns] + ".")); } } @@ -74,7 +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.push(SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, `${srvRecord.target}.`)); + commit.push(SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")); } }