diff --git a/domains/polls.json b/domains/polls.json deleted file mode 100644 index be315fac0..000000000 --- a/domains/polls.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "Yunexiz", - "discord": "1040303561847881729" - }, - "record": { - "URL": "https://y.is-a.dev" - } -} diff --git a/domains/rdap.json b/domains/rdap.json deleted file mode 100644 index f2b45dc76..000000000 --- a/domains/rdap.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "rdaphq", - "email": "rdapshii@gmail.com" - }, - "record": { - "A": ["156.67.73.46"] - } -} diff --git a/tests/json.test.js b/tests/json.test.js index 4da5b896f..123902a73 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -30,7 +30,7 @@ const optionalRedirectConfigFields = { const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; const hostnameRegex = /^(?=.{1,253}$)(?:(?:[_a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+[a-zA-Z]{2,63}$/; -const exceptedDomains = require("../util/excepted.json"); +const excludedDomains = require("../util/excluded.json"); const reservedDomains = require("../util/reserved.json"); const domainsPath = path.resolve("domains"); const files = fs.readdirSync(domainsPath); @@ -113,7 +113,7 @@ async function validateFileName(t, file) { const rootSubdomain = subdomain.split(".").pop(); - if (!exceptedDomains.includes(rootSubdomain)) { + if (!excludedDomains.includes(rootSubdomain)) { t.false(rootSubdomain.startsWith("_"), `${file}: Root subdomains should not start with an underscore`); } } diff --git a/util/excepted.json b/util/excluded.json similarity index 100% rename from util/excepted.json rename to util/excluded.json diff --git a/util/reserved.json b/util/reserved.json index 66153768a..9b81d53fa 100644 --- a/util/reserved.json +++ b/util/reserved.json @@ -3,11 +3,14 @@ "about", "account", "accounts", + "ad", "admin", + "ads", "api", "apis", "app", "apps", + "asset", "assets", "auth", "authentication", @@ -15,8 +18,6 @@ "authorise", "authorization", "authorize", - "ad", - "ads", "billing", "blog", "board", @@ -37,6 +38,8 @@ "documentation", "domain", "email", + "event", + "events", "example", "feedback", "file", @@ -98,6 +101,8 @@ "pay", "payment", "payments", + "poll", + "polls", "portal", "postmaster", "preview", @@ -105,6 +110,7 @@ "prod", "production", "r", + "rdap", "redirect", "register", "registrar", @@ -116,6 +122,7 @@ "service", "services", "shop", + "sso", "staff", "staging", "static",