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: diff --git a/dnsconfig.js b/dnsconfig.js index 9e5fdd99f1..233be9a7f1 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,7 +133,7 @@ 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)); } } @@ -142,7 +142,14 @@ var reserved = require("./util/reserved.json"); // 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 ( + subdomain !== "ns1" && + subdomain !== "ns2" && + subdomain !== "ns3" && + subdomain !== "ns4" + ) { + records.push(CNAME(subdomain, "reserved.is-a.dev.", CF_PROXY_ON)); + } } var options = { 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",