From f283f89adaf2bc6fa26577c3457cd6f1eeddf864 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:29:59 +0800 Subject: [PATCH 1/5] run publish workflow on reserved update --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d32369fba..6094cba766 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,6 +6,7 @@ on: paths: - "domains/*" - ".github/workflows/publish.yml" + - "util/reserved.json" - "dnsconfig.js" workflow_dispatch: From c3d3b2e16b544885a080e2e95487058a8a4f4808 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:30:29 +0800 Subject: [PATCH 2/5] reserve `home` --- util/reserved.json | 1 + 1 file changed, 1 insertion(+) diff --git a/util/reserved.json b/util/reserved.json index a285827d2f..e8c56c7e82 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -39,6 +39,7 @@ "help", "helper", "helpers", + "home", "hostmaster", "http", "https", From c52e579ac641fffba4d186901e9f8819f097fc75 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:33:58 +0800 Subject: [PATCH 3/5] Update dnsconfig.js --- dnsconfig.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dnsconfig.js b/dnsconfig.js index 9e5fdd99f1..9d63707afa 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -139,10 +139,19 @@ for (var subdomain in domains) { var reserved = require("./util/reserved.json"); +var excludedReserved = [ + "ns1", + "ns2", + "ns3", + "ns4" +] + // Handle reserved domains for (var i = 0; i < reserved.length; i++) { var subdomain = reserved[i]; - records.push(CNAME(subdomain, "reserved.is-a.dev.", CF_PROXY_ON)); + if (!excludedReserved.includes(subdomain)) { + records.push(CNAME(subdomain, "reserved.is-a.dev.", CF_PROXY_ON)); + } } var options = { From afa6839ab84001dc879bb7bea499fc321ca94dd0 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:35:37 +0800 Subject: [PATCH 4/5] fix formatting --- dnsconfig.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 9d63707afa..390b3f0a6d 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -104,20 +104,20 @@ for (var subdomain in domains) { // Handle TLSA records if (domainData.record.TLSA) { - for (var tlsa in domainData.record.TLSA) { - var tlsaRecord = domainData.record.TLSA[tlsa]; + for (var tlsa in domainData.record.TLSA) { + var tlsaRecord = domainData.record.TLSA[tlsa]; - records.push( - TLSA( - subdomainName, - tlsaRecord.usage, - tlsaRecord.selector, - tlsaRecord.matchingType, - tlsaRecord.certificate - ) - ); - } - } + records.push( + TLSA( + subdomainName, + tlsaRecord.usage, + tlsaRecord.selector, + tlsaRecord.matchingType, + tlsaRecord.certificate + ) + ); + } + } // Handle TXT records if (domainData.record.TXT) { @@ -133,14 +133,14 @@ for (var subdomain in domains) { // Handle URL records if (domainData.record.URL) { records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON)); - records.push(TXT("_redirect." + subdomainName, domainData.record.URL)); + records.push(TXT("_redirect." + subdomainName, domainData.record.URL)); } } var reserved = require("./util/reserved.json"); var excludedReserved = [ - "ns1", + "ns1", "ns2", "ns3", "ns4" From 62fde92368a9676cd138b136506978fd2ae258a0 Mon Sep 17 00:00:00 2001 From: William Harrison <87287585+wdhdev@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:39:35 +0800 Subject: [PATCH 5/5] Update dnsconfig.js --- dnsconfig.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 390b3f0a6d..233be9a7f1 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -139,17 +139,15 @@ for (var subdomain in domains) { var reserved = require("./util/reserved.json"); -var excludedReserved = [ - "ns1", - "ns2", - "ns3", - "ns4" -] - // Handle reserved domains for (var i = 0; i < reserved.length; i++) { var subdomain = reserved[i]; - if (!excludedReserved.includes(subdomain)) { + if ( + subdomain !== "ns1" && + subdomain !== "ns2" && + subdomain !== "ns3" && + subdomain !== "ns4" + ) { records.push(CNAME(subdomain, "reserved.is-a.dev.", CF_PROXY_ON)); } }