From 7840f0d497c1793c3fb1b805d7a3ac6d03f6a970 Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 14 Jun 2021 20:53:45 -0400 Subject: [PATCH 01/12] Update jj.json --- domains/jj.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/domains/jj.json b/domains/jj.json index 9c5389640..0b2b3abfa 100644 --- a/domains/jj.json +++ b/domains/jj.json @@ -6,6 +6,19 @@ "email": "TheBotlyNoob@gmail.com" }, "record": { - "URL": "https://j-j.vercel.app" + "URL": "https://j-j.vercel.app", + "MX": [ + { + "priority": 10, + "value": "mx1.improvmx.com." + }, + { + "priority": 20, + "value": "mx2.improvmx.com." + } + ], + "TXT" [ + "v=spf1 include:spf.improvmx.com ~all" + ] } } From 74c46856f2a525609682e5d77ad717001cd3665a Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 14 Jun 2021 20:55:14 -0400 Subject: [PATCH 02/12] add colon --- domains/jj.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains/jj.json b/domains/jj.json index 0b2b3abfa..b4ea32235 100644 --- a/domains/jj.json +++ b/domains/jj.json @@ -17,7 +17,7 @@ "value": "mx2.improvmx.com." } ], - "TXT" [ + "TXT": [ "v=spf1 include:spf.improvmx.com ~all" ] } From 4adc1cdad56d764d87eec7683ff63ae7e597e70a Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 6 Sep 2021 20:08:40 -0400 Subject: [PATCH 03/12] Update and rename jj.json to jj-emails.json --- domains/jj-emails.json | 14 ++++++++++++++ domains/jj.json | 24 ------------------------ 2 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 domains/jj-emails.json delete mode 100644 domains/jj.json diff --git a/domains/jj-emails.json b/domains/jj-emails.json new file mode 100644 index 000000000..9a9d492ee --- /dev/null +++ b/domains/jj-emails.json @@ -0,0 +1,14 @@ +{ + "description": "Jay Jackson's emails", + "owner": { + "username": "TheBotlyNoob", + "email": "TheBotlyNoob@gmail.com" + }, + "record": { + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": "v=spf1 include:spf.improvmx.com ~all" + } +} diff --git a/domains/jj.json b/domains/jj.json deleted file mode 100644 index b4ea32235..000000000 --- a/domains/jj.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "description": "TheBotlyNoob's development website", - "repo": "https://github.com/TheBotlyNoob/TheBotlyNoob.github.io", - "owner": { - "username": "TheBotlyNoob", - "email": "TheBotlyNoob@gmail.com" - }, - "record": { - "URL": "https://j-j.vercel.app", - "MX": [ - { - "priority": 10, - "value": "mx1.improvmx.com." - }, - { - "priority": 20, - "value": "mx2.improvmx.com." - } - ], - "TXT": [ - "v=spf1 include:spf.improvmx.com ~all" - ] - } -} From 9ddcc682e7c90a05fa2b0cb048e8326c8d1335cb Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 6 Sep 2021 20:11:06 -0400 Subject: [PATCH 04/12] Create maintainer-emails.json --- domains/maintainer-emails.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 domains/maintainer-emails.json diff --git a/domains/maintainer-emails.json b/domains/maintainer-emails.json new file mode 100644 index 000000000..d2a068fef --- /dev/null +++ b/domains/maintainer-emails.json @@ -0,0 +1,14 @@ +{ + "description": "Emails For is-a.dev Maintainers", + "owner": { + "username": "TheBotlyNoob", + "email": "TheBotlyNoob@gmail.com" + }, + "record": { + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": "v=spf1 include:spf.improvmx.com ~all" + } +} From 49614cc73fd43185e327e1f4dbd557eb419eac12 Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 6 Sep 2021 20:17:47 -0400 Subject: [PATCH 05/12] Delete maintainer-emails.json --- domains/maintainer-emails.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 domains/maintainer-emails.json diff --git a/domains/maintainer-emails.json b/domains/maintainer-emails.json deleted file mode 100644 index d2a068fef..000000000 --- a/domains/maintainer-emails.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "Emails For is-a.dev Maintainers", - "owner": { - "username": "TheBotlyNoob", - "email": "TheBotlyNoob@gmail.com" - }, - "record": { - "MX": [ - "mx1.improvmx.com", - "mx2.improvmx.com" - ], - "TXT": "v=spf1 include:spf.improvmx.com ~all" - } -} From 6a9bf81ca7b9b9008b3a52cc840b8ec90a77adc7 Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Mon, 6 Sep 2021 21:59:03 -0400 Subject: [PATCH 06/12] Move to railway --- domains/jj.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 domains/jj.json diff --git a/domains/jj.json b/domains/jj.json new file mode 100644 index 000000000..1dcb4fdf6 --- /dev/null +++ b/domains/jj.json @@ -0,0 +1,11 @@ +{ + "description": "JJ's Website", + "repo": "https://github.com/TheBotlyNoob/website", + "owner": { + "username": "TheBotlyNoob", + "email": "TheBotlyNoob@gmail.com" + }, + "record": { + "CNAME": "website-production-wygz.up.railway.app" + } +} From 332b2237d5a06f1c5b8ff90824ad4b36d8d2333b Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Tue, 7 Sep 2021 12:35:19 -0400 Subject: [PATCH 07/12] change something for checks --- domains/jj-emails.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains/jj-emails.json b/domains/jj-emails.json index 9a9d492ee..b55850f22 100644 --- a/domains/jj-emails.json +++ b/domains/jj-emails.json @@ -1,5 +1,5 @@ { - "description": "Jay Jackson's emails", + "description": "JJ's emails", "owner": { "username": "TheBotlyNoob", "email": "TheBotlyNoob@gmail.com" From ed7ba1be44454be59301ac4b47141017864eefed Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Tue, 7 Sep 2021 12:40:02 -0400 Subject: [PATCH 08/12] Delete jj-emails.json --- domains/jj-emails.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 domains/jj-emails.json diff --git a/domains/jj-emails.json b/domains/jj-emails.json deleted file mode 100644 index b55850f22..000000000 --- a/domains/jj-emails.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "JJ's emails", - "owner": { - "username": "TheBotlyNoob", - "email": "TheBotlyNoob@gmail.com" - }, - "record": { - "MX": [ - "mx1.improvmx.com", - "mx2.improvmx.com" - ], - "TXT": "v=spf1 include:spf.improvmx.com ~all" - } -} From 58bcd42be9e1a6fdec9a4efefdac89f371a753fc Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Tue, 7 Sep 2021 12:40:32 -0400 Subject: [PATCH 09/12] gonna get an A record soon --- domains/jj.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/domains/jj.json b/domains/jj.json index 1dcb4fdf6..7f35c3685 100644 --- a/domains/jj.json +++ b/domains/jj.json @@ -6,6 +6,11 @@ "email": "TheBotlyNoob@gmail.com" }, "record": { - "CNAME": "website-production-wygz.up.railway.app" + "CNAME": "website-production-wygz.up.railway.app", + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": "v=spf1 include:spf.improvmx.com ~all" } } From 1c4c70dcab2415b28e813d9a83a725c736071a9e Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Tue, 7 Sep 2021 12:43:26 -0400 Subject: [PATCH 10/12] move to A record --- domains/jj.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/domains/jj.json b/domains/jj.json index 7f35c3685..16bc451e6 100644 --- a/domains/jj.json +++ b/domains/jj.json @@ -6,7 +6,9 @@ "email": "TheBotlyNoob@gmail.com" }, "record": { - "CNAME": "website-production-wygz.up.railway.app", + "A": [ + "35.230.85.45" + ], "MX": [ "mx1.improvmx.com", "mx2.improvmx.com" From 0e48ab5b1ec93df0a882a2b8d69509b553a31471 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Tue, 7 Sep 2021 22:21:19 +0530 Subject: [PATCH 11/12] validations: removes unnecessary validation --- tests/validations.test.js | 1 - utils/validations.js | 6 ------ 2 files changed, 7 deletions(-) diff --git a/tests/validations.test.js b/tests/validations.test.js index ceadd3ee9..d4c6806e0 100644 --- a/tests/validations.test.js +++ b/tests/validations.test.js @@ -45,7 +45,6 @@ describe('validateDomainData', () => { { ...defaultDomain, record: { CNAME: 'sd', A: ['121,3213'] } }, { ...defaultDomain, record: { A: ['121', '12'], FOOBAR: ['sd'] } }, { ...defaultDomain, record: { A: [] } }, - { ...defaultDomain, record: { A: ['11122'], URL: 'foobar' } }, { ...defaultDomain, owner: {}, }, { ...defaultDomain, owner: { username: 'hwelo', }, }, { ...defaultDomain, owner: { email: 'hwelo' }, }, diff --git a/utils/validations.js b/utils/validations.js index 87455d019..67a8d3df5 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -7,11 +7,6 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//ig)]); const isValidDomain = and([R.is(String), testRegex(/^(([a-z0-9\-]+)\.)+[a-z]+$/ig)]); -const allowMXRecord = R.compose( - R.ifElse(R.includes('MX'), withLengthEq(2), withLengthEq(1)), - R.keys, -); - const validateCnameRecord = type => and([ R.propIs(String, type), R.compose(withLengthEq(1), R.keys), // CNAME cannot be used with any other record @@ -21,7 +16,6 @@ const validateCnameRecord = type => and([ const validateARecord = type => and([ R.propIs(Array, type), - allowMXRecord, R.propSatisfies(withLengthGte(1), type), ]); From c3b1481e662a215653307bb7798a826fb5c18573 Mon Sep 17 00:00:00 2001 From: Jay Jackson Date: Tue, 7 Sep 2021 19:17:03 +0000 Subject: [PATCH 12/12] Add no-stale label --- .github/workflows/stale.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f750eb678..f86a846fb 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -17,3 +17,5 @@ jobs: days-before-close: 20 stale-issue-message: 'This issue has been marked as stale due to inactivity and will be closed. Comment anything on this PR to prevent it' stale-pr-message: 'This pull request has been marked as stale due to inactivity and will be closed. Comment anything on this PR to prevent it' + exempt-issue-labels: 'no-stale' + exempt-pr-labels: 'no-stale'