diff --git a/dnsconfig.js b/dnsconfig.js index 833d3d6a58..b9453671ca 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -111,7 +111,7 @@ for (var subdomain in domains) { subdomainName, tlsaRecord.usage, tlsaRecord.selector, - tlsaRecord.matchingType, + tlsaRecord.matching_type, tlsaRecord.certificate ) ); @@ -136,6 +136,10 @@ for (var subdomain in domains) { // Manage service records if (data.services) { + if (data.services.bluesky) { + records.push(TXT("_atproto." + subdomainName, "\"" + data.services.bluesky + "\"")); + } + if (data.services.discord) { if (Array.isArray(data.services.discord)) { for (var txt in data.services.discord) { @@ -146,20 +150,6 @@ for (var subdomain in domains) { } } - if (data.services.vercel) { - if (Array.isArray(data.services.vercel)) { - for (var txt in data.services.vercel) { - records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel[txt] + "\"")); - } - } else { - records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel + "\"")); - } - } - - if (data.services.bluesky) { - records.push(TXT("_atproto." + subdomainName, "\"" + data.services.bluesky + "\"")); - } - if (data.services.gitlab) { if (Array.isArray(data.services.gitlab)) { for (var txt in data.services.gitlab) { @@ -169,6 +159,16 @@ for (var subdomain in domains) { records.push(TXT("_gitlab-pages-verification-code." + subdomainName, "\"" + data.services.gitlab + "\"")); } } + + if (data.services.vercel) { + if (Array.isArray(data.services.vercel)) { + for (var txt in data.services.vercel) { + records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel[txt] + "\"")); + } + } else { + records.push(TXT("_vercel." + subdomainName, "\"" + data.services.vercel + "\"")); + } + } } } diff --git a/domains/_github-pages-challenge-roxithereal.roxi.json b/domains/_github-pages-challenge-roxithereal.roxi.json new file mode 100644 index 0000000000..5c54ca975c --- /dev/null +++ b/domains/_github-pages-challenge-roxithereal.roxi.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "roxiTheReal", + "email": "aetheron.inc@proton.me" + }, + "records": { + "TXT": "b4a63d8475ddf68f5f1a907cb04fff" + } +} diff --git a/domains/_sharp._tcp.based.json b/domains/_sharp._tcp.based.json new file mode 100644 index 0000000000..3038a3f6e6 --- /dev/null +++ b/domains/_sharp._tcp.based.json @@ -0,0 +1,18 @@ +{ + "owner": { + "username": "dragsbruh", + "email": "dragsbruh@protonmail.com", + "discord": "781445370177126401", + "bluesky": "based.nya.pub" + }, + "records": { + "SRV": [ + { + "priority": 10, + "weight": 0, + "port": 1337, + "target": "sharp.based.is-a.dev" + } + ] + } +} diff --git a/domains/adarshsetty.json b/domains/adarshsetty.json new file mode 100644 index 0000000000..9305e27dbc --- /dev/null +++ b/domains/adarshsetty.json @@ -0,0 +1,15 @@ +{ + "description": "Adarsh's Portfolio and Website for design, coding, and more!", + "repo": "https://github.com/aasteriskz7/AdarshPortfolio/", + "owner": { + "username": "AAsteriskz7", + "email": "adarshsetty1@gmail.com", + "LinkedIn": "adarshsetty", + "Discord": "aasteriskz", + "Twitter": "aasteriskz" + }, + "records": { + "CNAME": "aasteriskz7.github.io" + }, + "proxied": true +} diff --git a/domains/affaz.json b/domains/affaz.json new file mode 100644 index 0000000000..5179c6db35 --- /dev/null +++ b/domains/affaz.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "affaz101", + "email": "cmt202150@gmail.com" + }, + "records": { + "CNAME": "affaz101.github.io" + } +} diff --git a/domains/aldess.json b/domains/aldess.json index aad12e1ae9..613cb035c6 100644 --- a/domains/aldess.json +++ b/domains/aldess.json @@ -1,9 +1,12 @@ { - "owner": { - "username": "AldessScratch", - "email": "aldess.sc@gmail.com" - }, - "records": { - "CNAME": "aldess.pages.dev" - } + "owner": { + "username": "AldessScratch", + "email": "aldess.sc@gmail.com" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=aldess.is-a.dev,677f969f699e3c3d4a5c" + } } diff --git a/domains/asutosh.json b/domains/asutosh.json new file mode 100644 index 0000000000..a6570d0b0a --- /dev/null +++ b/domains/asutosh.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "iAsutoshS", + "email": "yashasu40@gmail.com" + }, + "records": { + "CNAME": "iasutosh.vercel.app" + }, + "services": { + "vercel": "vc-domain-verify=asutosh.is-a.dev,3a54da32d6ba22f0a340" + } +} diff --git a/domains/badraan.json b/domains/badraan.json new file mode 100644 index 0000000000..fab163b7ba --- /dev/null +++ b/domains/badraan.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "mobadran", + "email": "badraanmo@gmail.com", + "discord": "gm.mo" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=badraan.is-a.dev,32cb3bde0c1514742541" + } +} diff --git a/domains/boboh.json b/domains/boboh.json new file mode 100644 index 0000000000..dffcfa9013 --- /dev/null +++ b/domains/boboh.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "mcyum", + "email": "derpingsteons@gmail.com" + }, + "records": { + "CNAME": "mcyum.github.io" + } +} diff --git a/domains/bys.json b/domains/bys.json new file mode 100644 index 0000000000..71df774d2c --- /dev/null +++ b/domains/bys.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "bysxx", + "email": "0415white@gmail.com" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=bys.is-a.dev,021d4aee3c19d366bf9b" + } +} diff --git a/domains/cirkutry.json b/domains/cirkutry.json deleted file mode 100644 index 92e13c6fdb..0000000000 --- a/domains/cirkutry.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "owner": { - "username": "Cirkutry", - "discord": "kre0lidge" - }, - "records": { - "CNAME": "cirkutry.github.io" - } -} diff --git a/domains/cosintan.json b/domains/cosintan.json new file mode 100644 index 0000000000..a7a434376d --- /dev/null +++ b/domains/cosintan.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "cosintan-tg", + "email": "cosintan.tg@gmail.com" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=cosintan.is-a.dev,b33d7124eaba6f7dca28", + "discord": "dh=cc6050f09d0f1563f4dd1b168879b9b03ad5e57f" + } +} diff --git a/domains/cube.json b/domains/cube.json new file mode 100644 index 0000000000..3e9112e3be --- /dev/null +++ b/domains/cube.json @@ -0,0 +1,10 @@ +{ + "description": "CubeZockii™ - Portfolio", + "owner": { + "username": "cubezockii", + "email": "cubezockii@gmail.com" + }, + "records": { + "CNAME": "cubezockii.github.io" + } +} diff --git a/domains/fleetha.json b/domains/fleetha.json index ad64ec6a8c..ae278c365c 100644 --- a/domains/fleetha.json +++ b/domains/fleetha.json @@ -4,6 +4,6 @@ "email": "fleetha.dev@gmail.com" }, "records": { - "URL": "https://fleetha.pythonanywhere.com" + "CNAME": "fleethaofficial.pages.dev" } } diff --git a/domains/hari.json b/domains/hari.json new file mode 100644 index 0000000000..b8bf99c846 --- /dev/null +++ b/domains/hari.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "harishnkr", + "email": "hari2menon1234@gmail.com" + }, + + "records": { + "CNAME": "harishnkr.github.io" + } +} diff --git a/domains/harys.json b/domains/harys.json index 75784126d6..09f35794ec 100644 --- a/domains/harys.json +++ b/domains/harys.json @@ -5,7 +5,7 @@ "email": "contact@harys.is-a.dev" }, "records": { - "CNAME": "harys722.github.io", + "CNAME": "harys.vercel.app", "TXT": ["zoho-verification=zb21864535.zmverify.zoho.com", "v=spf1 include:zohomail.com ~all", "google-site-verification=kyfbQxiPkwN9bikDvsKAiS5O4ZTgdW9gwSczKaZt7nQ"], "MX": [ { @@ -24,6 +24,7 @@ }, "proxied": true, "services": { + "vercel": "vc-domain-verify=harys.is-a.dev,0f7f97e958bfbe3e8831", "discord": "dh=b7e85268028e8c32676bf1e81122c1356159f27d" } } diff --git a/domains/jerrywu.json b/domains/jerrywu.json new file mode 100644 index 0000000000..9230b875be --- /dev/null +++ b/domains/jerrywu.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "JerryWu0430", + "email": "woohaoran@gmail.com" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=jerrywu.is-a.dev,02b8b5343accf141471f" + } +} diff --git a/domains/kaaeza.json b/domains/kaaeza.json new file mode 100644 index 0000000000..2420c24923 --- /dev/null +++ b/domains/kaaeza.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "kaaeza", + "email": "lamiasecondamail1@gmail.com" + }, + "records": { + "CNAME": "kaaeza.github.io" + } +} diff --git a/domains/kre0lidge.json b/domains/kre0lidge.json new file mode 100644 index 0000000000..e617234434 --- /dev/null +++ b/domains/kre0lidge.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "Cirkutry", + "email": "kre0lidge71@gmail.com" + }, + "records": { + "CNAME": "cname.vercel-dns.com" + }, + "services": { + "vercel": "vc-domain-verify=kre0lidge.is-a.dev,5a760466fc6ea35d95a7" + } +} diff --git a/domains/lucaspalma.json b/domains/lucaspalma.json new file mode 100644 index 0000000000..b46ef0d054 --- /dev/null +++ b/domains/lucaspalma.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "Lukkas98", + "email": "lucaspalma988@gmail.com" + }, + "records": { + "CNAME": "lucas-palma.vercel.app" + }, + "services": { + "vercel": "vc-domain-verify=lucaspalma.is-a.dev,ad8a6719b60aa49a2c7b" + } +} diff --git a/domains/nioka.json b/domains/nioka.json new file mode 100644 index 0000000000..ced6bf61ec --- /dev/null +++ b/domains/nioka.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "niokagi", + "email": "strictnioka@gmail.com" + }, + "records": { + "CNAME": "nioka.pages.dev" + } +} diff --git a/domains/pen.json b/domains/pen.json new file mode 100644 index 0000000000..04b2368495 --- /dev/null +++ b/domains/pen.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "VulcanoSoftware", + "discord": "814891541205876767" + }, + "records": { + "CNAME": "vulcanodirect.pages.dev" + } +} diff --git a/domains/ramoweb.json b/domains/ramoweb.json index 3643795c7b..dbd55dddd0 100644 --- a/domains/ramoweb.json +++ b/domains/ramoweb.json @@ -4,6 +4,6 @@ "email": "raul@ramoweb.com" }, "records": { - "CNAME": "ramoweb.onrender.com" + "CNAME": "ramoweb.com" } } diff --git a/domains/roxi.json b/domains/roxi.json new file mode 100644 index 0000000000..ce6571b9bf --- /dev/null +++ b/domains/roxi.json @@ -0,0 +1,22 @@ +{ + "owner": { + "username": "roxiTheReal", + "email": "aetheron.inc@proton.me" + }, + "records": { + "A": [ + "185.199.111.153", + "185.199.109.153", + "185.199.108.153", + "185.199.110.153" + ], + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": [ + "v=spf1 include:spf.improvmx.com ~all", + "openai-domain-verification=dv-aDPvVGgm94H2RBc5avIupJbC" + ] + } +} diff --git a/domains/satr14.json b/domains/satr14.json index 38698d70ec..18f32e48ca 100644 --- a/domains/satr14.json +++ b/domains/satr14.json @@ -5,5 +5,8 @@ }, "records": { "URL": "https://satr14.my.id/" + }, + "services": { + "discord": "dh=5e6f0586c145c4073d44aa1e3e4a01a9f2de442e" } } diff --git a/domains/semiqolonn.json b/domains/semiqolonn.json index 4de53e3a3c..8fba8d0a31 100644 --- a/domains/semiqolonn.json +++ b/domains/semiqolonn.json @@ -7,6 +7,7 @@ "CNAME": "semiqolonn.github.io" }, "services": { - "discord": "dh=ff7ac5f50b2671e388f1e378b4c46f2c7a867223" + "discord": "dh=ff7ac5f50b2671e388f1e378b4c46f2c7a867223", + "bluesky": "did=did:plc:7by3itciq5ufovihg4s5jt5i" } } diff --git a/domains/sharp.based.json b/domains/sharp.based.json new file mode 100644 index 0000000000..121905f292 --- /dev/null +++ b/domains/sharp.based.json @@ -0,0 +1,17 @@ +{ + "owner": { + "username": "dragsbruh", + "email": "dragsbruh@protonmail.com", + "discord": "781445370177126401", + "bluesky": "based.nya.pub" + }, + "description": "a domain for a SHARP-based search engine. using a friend's search vps to tunnel to my home.", + + "records": { + "A": ["94.130.137.16"] + }, + + "services": { + "discord": "dh=257c94db0d4d6fa3c3d077970008aa82cb6b7cb6" + } +} diff --git a/domains/shell.nightapi.json b/domains/shell.nightapi.json new file mode 100644 index 0000000000..233fd48908 --- /dev/null +++ b/domains/shell.nightapi.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "SoySapo6", + "email": "karatekidamericatv@gmail.com" + }, + "records": { + "CNAME": "nightshell.onrender.com" + } +} diff --git a/domains/shovonraul.json b/domains/shovonraul.json new file mode 100644 index 0000000000..e296e11a03 --- /dev/null +++ b/domains/shovonraul.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "ShovonRaul991", + "email": "shovon.kekar@gmail.com" + }, + "records": { + "A": ["75.2.60.5"] + } +} diff --git a/domains/sjaquer.json b/domains/sjaquer.json new file mode 100644 index 0000000000..6b82d69926 --- /dev/null +++ b/domains/sjaquer.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "sjaquer", + "email": "sjaquer@outlook.es" + }, + "records": { + "CNAME": "sjaquer.vercel.app" + }, + "proxied": true +} diff --git a/domains/spaghetti.json b/domains/spaghetti.json index 46b9b8cf0c..56d64ce62c 100644 --- a/domains/spaghetti.json +++ b/domains/spaghetti.json @@ -5,6 +5,6 @@ "discord": "spagwhetti" }, "records": { - "CNAME": "spaghetti.nekoweb.org" + "URL": "https://spaghetti.nekoweb.org" } } diff --git a/domains/tas33n.json b/domains/tas33n.json index 5c523b35fe..d1a9d1465b 100644 --- a/domains/tas33n.json +++ b/domains/tas33n.json @@ -4,6 +4,9 @@ "email": "tasu.legend@gmail.com" }, "records": { - "CNAME": "tas33n.pages.dev" + "A": ["76.76.21.21"] + }, + "services": { + "vercel": "vc-domain-verify=tas33n.is-a.dev,cb866d280e157a5c630a" } } diff --git a/domains/tg.json b/domains/tg.json new file mode 100644 index 0000000000..2b0dbf446d --- /dev/null +++ b/domains/tg.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "tggamesyt", + "email": "tothgergoci2@gmail.com" + }, + "records": { + "CNAME": "tggamesyt.github.io", + "TXT": "google-site-verification=MqP9uuv-eJnnCBGFcD2xK5ux6S1YZpLm2aySQQNiAWI" + }, + "proxied": true +} \ No newline at end of file diff --git a/domains/vaibhavingle.json b/domains/vaibhavingle.json new file mode 100644 index 0000000000..05a5759f17 --- /dev/null +++ b/domains/vaibhavingle.json @@ -0,0 +1,15 @@ +{ + "description": "Just a personal portfolio wesite ", + "repo": "https://github.com/vaibhavingle2007/portfolio-web.git", + "owner": { + "username": "vaibhavingle2007", + "email": "vaibhavingleg@gmail.com" + }, + "records": { + "CNAME": "portfolio-web-vaibhavingle2007s-projects.vercel.app" + }, + "proxied": true, + "services": { + "vercel": "vc-domain-verify=vaibhavingle.is-a.dev,393faf165de284bc9236" + } +} diff --git a/domains/wukalt.json b/domains/wukalt.json new file mode 100644 index 0000000000..000b27248e --- /dev/null +++ b/domains/wukalt.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "wukalt", + "email": "wuka.sec@gmail.com" + }, + "records": { + "CNAME": "wukalt.github.io" + } +} diff --git a/tests/records.test.js b/tests/records.test.js index 773de6bb61..38a0108878 100644 --- a/tests/records.test.js +++ b/tests/records.test.js @@ -212,8 +212,8 @@ function validateRecordValues(t, data, file) { `${file}: Invalid selector for ${key} at index ${idx}` ); t.true( - Number.isInteger(record.matchingType) && record.matchingType >= 0 && record.matchingType <= 255, - `${file}: Invalid matchingType for ${key} at index ${idx}` + Number.isInteger(record.matching_type) && record.matching_type >= 0 && record.matching_type <= 255, + `${file}: Invalid matching_type for ${key} at index ${idx}` ); t.true( isValidHexadecimal(record.certificate), diff --git a/util/raw-api.js b/util/raw-api.js index a4cc181151..f0ba57ef64 100644 --- a/util/raw-api.js +++ b/util/raw-api.js @@ -160,6 +160,9 @@ fs.readdir(directoryPath, function (err, files) { processedCount++; if (processedCount === files.length) { + v1.sort((a, b) => a.domain.localeCompare(b.subdomain)); + v2.sort((a, b) => a.domain.localeCompare(b.subdomain)); + fs.writeFile("raw-api/index.json", JSON.stringify(v1), (err) => { if (err) throw err; });