diff --git a/README.md b/README.md index 6c53a4027..9b4b42f9c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Open Pull Requests Open Issues
- Publish

is-a.dev

diff --git a/dnsconfig.js b/dnsconfig.js index 233be9a7f..2e056ad43 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -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 + "\"")); } } @@ -141,14 +141,14 @@ var reserved = require("./util/reserved.json"); // Handle reserved domains for (var i = 0; i < reserved.length; i++) { - var subdomain = reserved[i]; + var subdomainName = reserved[i]; if ( - subdomain !== "ns1" && - subdomain !== "ns2" && - subdomain !== "ns3" && - subdomain !== "ns4" + subdomainName !== "ns1" && + subdomainName !== "ns2" && + subdomainName !== "ns3" && + subdomainName !== "ns4" ) { - records.push(CNAME(subdomain, "reserved.is-a.dev.", CF_PROXY_ON)); + records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON)); } } diff --git a/domains/_vercel.sergioperea.json b/domains/_vercel.sergioperea.json new file mode 100644 index 000000000..c3b8cf061 --- /dev/null +++ b/domains/_vercel.sergioperea.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "sperea", + "email": "perea@mailfence.com" + }, + "record": { + "TXT": "vc-domain-verify=sergioperea.is-a.dev,ff9bc4d6b26eca2587d7" + } +} diff --git a/domains/all.json b/domains/all.json index d4ad8d0ea..de7c6e90a 100644 --- a/domains/all.json +++ b/domains/all.json @@ -12,6 +12,10 @@ "185.199.109.153", "185.199.110.153", "185.199.111.153" + ], + "TXT": [ + "google-site-verification=BbYZhMhwA6qo69R2udUA6wKJidmrTiWflfU01Kjm7eI", + "yandex-verification: 7cc47fa77df61676" ] } } diff --git a/domains/omarabdellatif.json b/domains/omarabdellatif.json deleted file mode 100644 index 2734d25ac..000000000 --- a/domains/omarabdellatif.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "description": "Serving my PERSONAL website", - "repo": "https://pog-frog.github.io/my-resume/", - "owner": { - "username": "Pog-Frog", - "email": "fireangle5621@gmail.com" - }, - "record": { - "URL": "https://pog-frog.github.io/my-resume/" - } -} diff --git a/domains/reserved.json b/domains/reserved.json deleted file mode 100644 index 2df8fef75..000000000 --- a/domains/reserved.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "is-a-dev", - "email": "admin@is-a.dev" - }, - "record": { - "URL": "https://is-a.dev/reserved" - } -} diff --git a/domains/sergioperea.json b/domains/sergioperea.json new file mode 100644 index 000000000..3d07f1a09 --- /dev/null +++ b/domains/sergioperea.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "sperea", + "email": "perea@mailfence.com" + }, + "record": { + "A": ["76.76.21.21"] + } +} diff --git a/tests/proxy.test.js b/tests/proxy.test.js index d7c73bc5b..4a193a5d5 100644 --- a/tests/proxy.test.js +++ b/tests/proxy.test.js @@ -21,9 +21,14 @@ function getDomainData(file) { } function validateProxiedRecords(t, data, file) { - // Convert the Set to an array for message display (moved outside the loop to optimize performance) const recordTypes = Array.from(requiredRecordsToProxy).join(", "); + // Forcefully stop raw.is-a.dev from being proxied + if (file === "raw.json") { + t.true(!data.proxied, `${file}: raw.is-a.dev cannot be proxied`); + return; + } + if (data.proxied) { const hasProxiedRecord = Object.keys(data.record).some((key) => requiredRecordsToProxy.has(key)); @@ -39,8 +44,8 @@ const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json" t("Domains with proxy enabled must have at least one proxy-able record", (t) => { files.forEach((file) => { - const domain = getDomainData(file); + const data = getDomainData(file); - validateProxiedRecords(t, domain, file); + validateProxiedRecords(t, data, file); }); }); diff --git a/util/reserved.json b/util/reserved.json index e8c56c7e8..37c071c97 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -100,6 +100,7 @@ "redirect", "registrar", "registry", + "reserved", "root", "secure", "security",