From 9fa09f30406c9f525704a4bd3cb023ae677a0476 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Tue, 29 Oct 2024 21:23:22 +0800 Subject: [PATCH 01/10] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 372768e87..09d67c9c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +# Temporary Downtime +Hey all, there is a temporary downtime for all subdomains as we migrate the is-a.dev zone to a different Cloudflare account. + +Sorry for any inconvenience. All subdomains temporarily will redirect to https://is-a.dev. + +--- +

is-a.dev Banner

From eacaeec4688f0c857deebc3267aafc89eb548c79 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 17:29:57 +0800 Subject: [PATCH 02/10] temp deploy some records --- dnsconfig.js | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index ee0eec18d..260f7c7d1 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -21,35 +21,35 @@ for (var subdomain in domains) { var proxyState = domainData.proxied ? { cloudflare_proxy: "on" } : { cloudflare_proxy: "off" }; // Handle A records - if (domainData.record.A) { - for (var a in domainData.record.A) { - commit.push(A(subdomainName, IP(domainData.record.A[a]), proxyState)); - } - } + // if (domainData.record.A) { + // for (var a in domainData.record.A) { + // 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.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState)); - } - } + // if (domainData.record.AAAA) { + // for (var aaaa in domainData.record.AAAA) { + // commit.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState)); + // } + // } // Handle CAA records - if (domainData.record.CAA) { - for (var caa in domainData.record.CAA) { - var caaRecord = domainData.record.CAA[caa]; - commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)); - } - } + // if (domainData.record.CAA) { + // for (var caa in domainData.record.CAA) { + // var caaRecord = domainData.record.CAA[caa]; + // commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)); + // } + // } // Handle CNAME records if (domainData.record.CNAME) { // Allow CNAME record on root if (subdomainName === "@") { commit.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState)); - } else { - commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); - } + // } else { + // commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); + // } } // Handle DS records @@ -72,12 +72,12 @@ for (var subdomain in domains) { } // Handle SRV records - 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 + ".")); - } - } + // 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 + ".")); + // } + // } // Handle TXT records if (domainData.record.TXT) { From c74cf71f5a169a84f01706a296394897857bd7d0 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 17:32:35 +0800 Subject: [PATCH 03/10] fix error --- dnsconfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 260f7c7d1..ae6fa7390 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -47,9 +47,9 @@ for (var subdomain in domains) { // Allow CNAME record on root if (subdomainName === "@") { commit.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState)); - // } else { + } else { // commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); - // } + } } // Handle DS records From cb025f898e43e34bd8aca02f83dc1d56638b806a Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 17:35:11 +0800 Subject: [PATCH 04/10] no txt records --- dnsconfig.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index ae6fa7390..cf4da739f 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -80,15 +80,15 @@ for (var subdomain in domains) { // } // Handle TXT records - if (domainData.record.TXT) { - if (Array.isArray(domainData.record.TXT)) { - for (var txt in domainData.record.TXT) { - commit.push(TXT(subdomainName, domainData.record.TXT[txt])); - } - } else { - commit.push(TXT(subdomainName, domainData.record.TXT)); - } - } + // if (domainData.record.TXT) { + // if (Array.isArray(domainData.record.TXT)) { + // for (var txt in domainData.record.TXT) { + // commit.push(TXT(subdomainName, domainData.record.TXT[txt])); + // } + // } else { + // commit.push(TXT(subdomainName, domainData.record.TXT)); + // } + // } // Handle URL records if (domainData.record.URL) { From 9394cfd3486ceff639250993eb3400a19bdc4641 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 17:49:39 +0800 Subject: [PATCH 05/10] use array index as MX priority --- dnsconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsconfig.js b/dnsconfig.js index cf4da739f..78f0ed371 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -60,7 +60,7 @@ for (var subdomain in domains) { // 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 + parseInt(mx), domainData.record.MX[mx] + ".")); } } From d5e3b01001a0f628c809855f541a8dd20a7532b7 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 18:08:53 +0800 Subject: [PATCH 06/10] Update dnsconfig.js --- dnsconfig.js | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 78f0ed371..714a62a8a 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -21,26 +21,26 @@ for (var subdomain in domains) { var proxyState = domainData.proxied ? { cloudflare_proxy: "on" } : { cloudflare_proxy: "off" }; // Handle A records - // if (domainData.record.A) { - // for (var a in domainData.record.A) { - // commit.push(A(subdomainName, IP(domainData.record.A[a]), proxyState)); - // } - // } + if (domainData.record.A) { + for (var a in domainData.record.A) { + 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.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState)); - // } - // } + if (domainData.record.AAAA) { + for (var aaaa in domainData.record.AAAA) { + commit.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState)); + } + } // Handle CAA records - // if (domainData.record.CAA) { - // for (var caa in domainData.record.CAA) { - // var caaRecord = domainData.record.CAA[caa]; - // commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)); - // } - // } + if (domainData.record.CAA) { + for (var caa in domainData.record.CAA) { + var caaRecord = domainData.record.CAA[caa]; + commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value)); + } + } // Handle CNAME records if (domainData.record.CNAME) { @@ -48,7 +48,7 @@ for (var subdomain in domains) { if (subdomainName === "@") { commit.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState)); } else { - // commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); + commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState)); } } @@ -72,23 +72,23 @@ for (var subdomain in domains) { } // Handle SRV records - // 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 + ".")); - // } - // } + 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 + ".")); + } + } // Handle TXT records - // if (domainData.record.TXT) { - // if (Array.isArray(domainData.record.TXT)) { - // for (var txt in domainData.record.TXT) { - // commit.push(TXT(subdomainName, domainData.record.TXT[txt])); - // } - // } else { - // commit.push(TXT(subdomainName, domainData.record.TXT)); - // } - // } + if (domainData.record.TXT) { + if (Array.isArray(domainData.record.TXT)) { + for (var txt in domainData.record.TXT) { + commit.push(TXT(subdomainName, domainData.record.TXT[txt])); + } + } else { + commit.push(TXT(subdomainName, domainData.record.TXT)); + } + } // Handle URL records if (domainData.record.URL) { From edb62cae1ca1969ad8f261bcff97814b83e490e7 Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 18:45:26 +0800 Subject: [PATCH 07/10] add url records --- dnsconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsconfig.js b/dnsconfig.js index 714a62a8a..965acf3b0 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -92,7 +92,7 @@ for (var subdomain in domains) { // Handle URL records if (domainData.record.URL) { - // Temporarily disabled + commit.push(A(subdomainName, IP("192.0.2.1"), { cloudflare_proxy: "on" })); } } From 3acf568480f1e303ea23be2ab0db35b1a2fef23b Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 18:49:54 +0800 Subject: [PATCH 08/10] Create w.json --- domains/w.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 domains/w.json diff --git a/domains/w.json b/domains/w.json new file mode 100644 index 000000000..87c47b82a --- /dev/null +++ b/domains/w.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "wdhdev", + "email": "william@is-a.dev" + }, + + "record": { + "URL": "https://william.is-a.dev" + } +} From 4440e646d786e79a8fc6245a9212c162bf5b5b8b Mon Sep 17 00:00:00 2001 From: William Harrison Date: Wed, 30 Oct 2024 19:07:23 +0800 Subject: [PATCH 09/10] Update dnsconfig.js --- dnsconfig.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dnsconfig.js b/dnsconfig.js index 965acf3b0..e292badeb 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -106,6 +106,7 @@ commit.push(IGNORE("_dmarc", "TXT")); commit.push(IGNORE("_psl", "TXT")); commit.push(IGNORE("autoconfig", "CNAME")); commit.push(IGNORE("autodiscover", "CNAME")); +commit.push(IGNORE("internal", "DS,NS")); commit.push(IGNORE("ns[1-5]", "A,AAAA")); // Commit all DNS records From fb0b216b7ec2d8541ac212fcfdabb3ceb0fb98cc Mon Sep 17 00:00:00 2001 From: orangc Date: Wed, 30 Oct 2024 14:33:59 +0300 Subject: [PATCH 10/10] Update MAINTAINERS.md --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index cb300be61..3c503188b 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -7,5 +7,5 @@ | Daniel | [@hackermondev](https://github.com/hackermondev) | Maintainer | | DIBSTER | [@DEV-DIBSTER](https://github.com/DEV-DIBSTER) | Maintainer | | Om | [@omsenjalia](https://github.com/omsenjalia) | Maintainer | -| orangc | [@orxngc](https://github.com/orxngc) | Maintainer | +| orangc | [@orangci](https://github.com/orangci) | Maintainer | | Stef | [@Stef-00012](https://github.com/Stef-00012) | Maintainer |