diff --git a/domains/_minecraft._tcp.mc.3gee.json b/domains/_minecraft._tcp.mc.3gee.json index ca7a9f426..b717967fb 100644 --- a/domains/_minecraft._tcp.mc.3gee.json +++ b/domains/_minecraft._tcp.mc.3gee.json @@ -9,7 +9,7 @@ "priority": 0, "weight": 5, "port": 32279, - "target": "gold.magmanode.com" + "target": "mc.3gee.is-a.dev" } ] } diff --git a/domains/api.karyakarsa.willo.json b/domains/api.karyakarsa.willo.json deleted file mode 100644 index c70b3e330..000000000 --- a/domains/api.karyakarsa.willo.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "description": "api for karyakarsa", - "repo": "https://github.com/WilloIzCitron/karyakarsa-rest-api", - "owner": { - "username": "WilloIzCitron", - "twitter": "willoizcitron" - }, - "record": { - "CNAME": "karyakarsa-rest-api-production.up.railway.app" - } -} diff --git a/domains/auth.sign.alvin.json b/domains/auth.sign.alvin.json new file mode 100644 index 000000000..c279d0ff2 --- /dev/null +++ b/domains/auth.sign.alvin.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "alvinsjoy", + "discord": "825382504353234954" + }, + "record": { + "TXT": "Created to allow nested subdomains to exist." + } +} diff --git a/domains/mc.3gee.json b/domains/mc.3gee.json new file mode 100644 index 000000000..754a634a0 --- /dev/null +++ b/domains/mc.3gee.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "3geETR", + "email": "egemacun@gmail.com" + }, + "record": { + "CNAME": "gold.magmanode.com" + } +} diff --git a/tests/domains.test.js b/tests/domains.test.js index 9df9598f4..43395fcda 100644 --- a/tests/domains.test.js +++ b/tests/domains.test.js @@ -24,26 +24,31 @@ function getDomainData(subdomain) { t("Nested subdomains should not exist without a parent subdomain", (t) => { files.forEach((file) => { const subdomain = file.replace(/\.json$/, ""); - const parentDomain = subdomain.split(".").reverse()[0]; + const parts = subdomain.split("."); + + for (let i = 1; i < parts.length; i++) { + const parent = parts.slice(i).join("."); + if (parent.startsWith("_")) continue; - if (parentDomain !== subdomain) { t.true( - parentDomain && files.includes(`${parentDomain}.json`), - `${file}: Parent subdomain does not exist` + files.includes(`${parent}.json`), + `${file}: Parent subdomain "${parent}" does not exist` ); } }); }); -t("Nested subdomains should not exist if the parent subdomain has NS records", (t) => { +t("Nested subdomains should not exist if any parent subdomain has NS records", (t) => { files.forEach((file) => { const subdomain = file.replace(/\.json$/, ""); - const parentDomain = subdomain.split(".").reverse()[0]; + const parts = subdomain.split("."); - if (parentDomain !== subdomain) { - const parentData = getDomainData(parentDomain); + for (let i = 1; i < parts.length; i++) { + const parent = parts.slice(i).join("."); + if (parent.startsWith("_") || !files.includes(`${parent}.json`)) continue; + const parentData = getDomainData(parent); - t.true(!parentData.record.NS, `${file}: Parent subdomain has NS records`); + t.true(!parentData.record.NS, `${file}: Parent subdomain "${parent}" has NS records`); } }); });