From 764367eee6495d2c68f7fccf60589b741ce89093 Mon Sep 17 00:00:00 2001 From: YajTPG <51419431+YajTPG@users.noreply.github.com> Date: Sun, 25 Oct 2020 01:13:10 +0530 Subject: [PATCH 1/9] Create yajtpg.json --- domains/yajtpg.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 domains/yajtpg.json diff --git a/domains/yajtpg.json b/domains/yajtpg.json new file mode 100644 index 000000000..087aa7d3d --- /dev/null +++ b/domains/yajtpg.json @@ -0,0 +1,14 @@ +{ + "description": "YajTPG's website", + "repo": "https://github.com/YajTPG", + "owner": { + "username": "YajTPG", + "email": "yajtpg@gmail.com" + }, + "record": { + "CNAME": "ns101.cloudns.net", + "CNAME": "ns102.cloudns.net", + "CNAME": "ns103.cloudns.net", + "CNAME": "ns104.cloudns.net" + } +} From db66ba289789da742f609d367d4de78e8959aaca Mon Sep 17 00:00:00 2001 From: YajTPG <51419431+YajTPG@users.noreply.github.com> Date: Mon, 26 Oct 2020 14:36:58 +0530 Subject: [PATCH 2/9] Update yajtpg.json --- domains/yajtpg.json | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/domains/yajtpg.json b/domains/yajtpg.json index 087aa7d3d..6528252be 100644 --- a/domains/yajtpg.json +++ b/domains/yajtpg.json @@ -1,14 +1,16 @@ { - "description": "YajTPG's website", - "repo": "https://github.com/YajTPG", - "owner": { - "username": "YajTPG", - "email": "yajtpg@gmail.com" - }, - "record": { - "CNAME": "ns101.cloudns.net", - "CNAME": "ns102.cloudns.net", - "CNAME": "ns103.cloudns.net", - "CNAME": "ns104.cloudns.net" - } + "description":"YajTPG's website", + "repo":"https://github.com/YajTPG", + "owner":{ + "username":"YajTPG", + "email":"yajtpg@gmail.com" + }, + "record":{ + "CNAME":[ + "ns101.cloudns.net", + "ns102.cloudns.net", + "ns103.cloudns.net", + "ns104.cloudns.net" + ] + } } From 933300d96f529422d6bc4da7a2511b4419b52271 Mon Sep 17 00:00:00 2001 From: YajTPG <51419431+YajTPG@users.noreply.github.com> Date: Mon, 26 Oct 2020 14:44:33 +0530 Subject: [PATCH 3/9] Update yajtpg.json --- domains/yajtpg.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/domains/yajtpg.json b/domains/yajtpg.json index 6528252be..70f56253b 100644 --- a/domains/yajtpg.json +++ b/domains/yajtpg.json @@ -6,11 +6,9 @@ "email":"yajtpg@gmail.com" }, "record":{ - "CNAME":[ - "ns101.cloudns.net", - "ns102.cloudns.net", - "ns103.cloudns.net", - "ns104.cloudns.net" - ] + "CNAME":"ns101.cloudns.net", + "CNAME":"ns102.cloudns.net", + "CNAME":"ns103.cloudns.net", + "CNAME":"ns104.cloudns.net" } } From 29fea6e0004b3b123e1095a19945de1fda33b7ef Mon Sep 17 00:00:00 2001 From: YajTPG <51419431+YajTPG@users.noreply.github.com> Date: Tue, 27 Oct 2020 06:49:03 +0530 Subject: [PATCH 4/9] Update yajtpg.json --- domains/yajtpg.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/domains/yajtpg.json b/domains/yajtpg.json index 70f56253b..026f414ea 100644 --- a/domains/yajtpg.json +++ b/domains/yajtpg.json @@ -6,9 +6,11 @@ "email":"yajtpg@gmail.com" }, "record":{ - "CNAME":"ns101.cloudns.net", - "CNAME":"ns102.cloudns.net", - "CNAME":"ns103.cloudns.net", - "CNAME":"ns104.cloudns.net" + "A":[ + "85.159.233.158", + "108.59.1.30", + "217.182.183.225", + "185.206.180.169" + ] } } From bd5d1fa416535a164ee0f76a6950d0c13d596ee5 Mon Sep 17 00:00:00 2001 From: Tegas Aziz <49786146+WilloIzCitron@users.noreply.github.com> Date: Tue, 27 Oct 2020 08:28:09 +0700 Subject: [PATCH 5/9] Create willo.json --- domains/willo.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 domains/willo.json diff --git a/domains/willo.json b/domains/willo.json new file mode 100644 index 000000000..b30923e65 --- /dev/null +++ b/domains/willo.json @@ -0,0 +1,12 @@ +{ + "description": "A First Willo`s Website", + "repo": "https://github.com/WilloIzCitron/willoizcitron.github.io", + "owner": { + "username": "WilloIzCitron", + "email": "" + "twitter": "tegasaziz" + }, + "record": { + "CNAME": "willoizcitron.github.io" + } +} From f3753f8d0da6c159652683f19f7ee0b0b7a65111 Mon Sep 17 00:00:00 2001 From: Tegas Aziz <49786146+WilloIzCitron@users.noreply.github.com> Date: Tue, 27 Oct 2020 08:29:41 +0700 Subject: [PATCH 6/9] fix --- domains/willo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains/willo.json b/domains/willo.json index b30923e65..286b03212 100644 --- a/domains/willo.json +++ b/domains/willo.json @@ -3,7 +3,7 @@ "repo": "https://github.com/WilloIzCitron/willoizcitron.github.io", "owner": { "username": "WilloIzCitron", - "email": "" + "email": "", "twitter": "tegasaziz" }, "record": { From 10eacf39417436f1dabd7c7ae61a69a0d1c73228 Mon Sep 17 00:00:00 2001 From: Willian Arsenio de Sousa Date: Mon, 26 Oct 2020 23:12:23 -0300 Subject: [PATCH 7/9] Create willian.json --- domains/willian.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 domains/willian.json diff --git a/domains/willian.json b/domains/willian.json new file mode 100644 index 000000000..a8a177eda --- /dev/null +++ b/domains/willian.json @@ -0,0 +1,12 @@ +{ + "description": "Willian Arsenio's Website", + "repo": "https://github.com/waveiro/waveiro.github.io", + "owner": { + "username": "waveiro", + "email": "", + "twitter": "@waveiro" + }, + "record": { + "CNAME": "waveiro.github.io" + } +} From 17d785b9bac53db9bdbbb87d072e229e13a627ff Mon Sep 17 00:00:00 2001 From: Tharindu Sathischandra <34299693+tharindusathis@users.noreply.github.com> Date: Tue, 27 Oct 2020 10:22:59 +0530 Subject: [PATCH 8/9] Update tharindu.json --- domains/tharindu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/domains/tharindu.json b/domains/tharindu.json index d801c75c4..715d21f7c 100644 --- a/domains/tharindu.json +++ b/domains/tharindu.json @@ -1,11 +1,11 @@ { "description": "Tharindu's personal developer website", - "repo": "https://github.com/tharindusathis/tharindu", + "repo": "https://github.com/tharindusathis/tharindusathis.github.io", "owner": { "username": "tharindusathis", "email": "tharindu.sathis@gmail.com" }, "record": { - "CNAME": "tharindu.vercel.app" + "CNAME": "tharindusathis.github.io" } -} \ No newline at end of file +} From 112f8ce91c16bae6f08dc489dbf85e1ef52cd7f5 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Tue, 27 Oct 2020 13:09:09 +0530 Subject: [PATCH 9/9] Fixes root domain pointing --- domains/@.json | 6 ++++-- utils/domain-service.js | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/domains/@.json b/domains/@.json index 1a088239e..164375f24 100644 --- a/domains/@.json +++ b/domains/@.json @@ -5,5 +5,7 @@ "username": "phenax", "email": "phenax5@gmail.com" }, - "record": {} -} \ No newline at end of file + "record": { + "URL": "https://www.is-a.dev" + } +} diff --git a/utils/domain-service.js b/utils/domain-service.js index 984d274cb..446ca5579 100644 --- a/utils/domain-service.js +++ b/utils/domain-service.js @@ -6,7 +6,7 @@ const { then, log, print, lazyTask, batchLazyTasks } = require('./helpers'); const BATCH_SIZE = 1; const recordToRedirection = ({ name, address }) => ({ - domain: `${name}.${DOMAIN_DOMAIN}`, + domain: name === '@' ? DOMAIN_DOMAIN : `${name}.${DOMAIN_DOMAIN}`, redirect: address, type: 'permanent', redirect_wildcard: 1, @@ -20,7 +20,7 @@ const recordToZone = ({ name, type, address, id }) => ({ ...(type === 'CNAME' ? { cname: address } : {}), }); -const cleanName = name => `${name}`.replace(new RegExp(`\\.${DOMAIN_DOMAIN}\\.?$`), '').toLowerCase(); +const cleanName = name => name === DOMAIN_DOMAIN ? '@' : `${name}`.replace(new RegExp(`\\.${DOMAIN_DOMAIN}\\.?$`), '').toLowerCase(); const zoneToRecord = ({ name, type, cname, address, record, line: id }) => ({ id, @@ -42,7 +42,7 @@ const diffRecords = (oldRecords, newRecords) => { const remove = R.differenceWith(isMatchingRecord, oldRecords, newRecords); const add = R.differenceWith(isMatchingRecord, newRecords, oldRecords) - .filter(r => !['www', '@'].includes(r.name)); + .filter(r => !['www'].includes(r.name)); return { add, remove }; };