From 800cae0c3c0ce2d7251dafdf2e674a1bab2f87e1 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:57:35 +0800
Subject: [PATCH 01/17] Update dnsconfig.js
---
dnsconfig.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index 40faa0fcb..13697d098 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -113,4 +113,11 @@ commit.push(IGNORE("dkim._domainkey", "TXT"));
commit.push(IGNORE("ns[1-5]", "A,AAAA"));
// Commit all DNS records
-D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare")), commit);
+D(
+ "is-a.dev",
+ DnsProvider(NewDnsProvider("cloudflare"), 0),
+ NAMESERVER("gold.foundationdns.com."),
+ NAMESERVER("gold.foundationdns.net."),
+ NAMESERVER("gold.foundationdns.org."),
+ commit
+);
From e1e04f16703082ad71ae9c176e1231069c625765 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:59:05 +0800
Subject: [PATCH 02/17] Update dnsconfig.js
---
dnsconfig.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/dnsconfig.js b/dnsconfig.js
index 13697d098..b805d97de 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -115,6 +115,7 @@ commit.push(IGNORE("ns[1-5]", "A,AAAA"));
// Commit all DNS records
D(
"is-a.dev",
+ NewRegistrar("none"),
DnsProvider(NewDnsProvider("cloudflare"), 0),
NAMESERVER("gold.foundationdns.com."),
NAMESERVER("gold.foundationdns.net."),
From 90a87b7477c1d2d32e51c83394deef486b948ae5 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:00:24 +0800
Subject: [PATCH 03/17] Update dnsconfig.js
---
dnsconfig.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index b805d97de..b541aab2f 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -117,8 +117,5 @@ D(
"is-a.dev",
NewRegistrar("none"),
DnsProvider(NewDnsProvider("cloudflare"), 0),
- NAMESERVER("gold.foundationdns.com."),
- NAMESERVER("gold.foundationdns.net."),
- NAMESERVER("gold.foundationdns.org."),
commit
);
From 2d4144b982d99b59fd2c9850c5c30ae887077097 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:07:44 +0800
Subject: [PATCH 04/17] Update dnsconfig.js
---
dnsconfig.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index b541aab2f..a19e459fd 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -113,9 +113,4 @@ commit.push(IGNORE("dkim._domainkey", "TXT"));
commit.push(IGNORE("ns[1-5]", "A,AAAA"));
// Commit all DNS records
-D(
- "is-a.dev",
- NewRegistrar("none"),
- DnsProvider(NewDnsProvider("cloudflare"), 0),
- commit
-);
+D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), commit);
From 0733ee6ec08a5c206105bfd5f2456d83a529adbe Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:28:11 +0800
Subject: [PATCH 05/17] chore: add defaults, move exceptions + rename commit to
records
---
dnsconfig.js | 58 ++++++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index a19e459fd..0be763602 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -12,25 +12,25 @@ function getDomainsList(filesPath) {
}
var domains = getDomainsList("./domains");
-var commit = [];
+var records = [];
for (var subdomain in domains) {
var subdomainName = domains[subdomain].name;
var fullSubdomain = subdomainName + ".is-a.dev";
var domainData = domains[subdomain].data;
- var proxyState = domainData.proxied ? { cloudflare_proxy: "on" } : { cloudflare_proxy: "off" };
+ var proxyState = domainData.proxied ? CF_PROXY_ON : CF_PROXY_OFF;
// Handle A records
if (domainData.record.A) {
for (var a in domainData.record.A) {
- commit.push(A(subdomainName, IP(domainData.record.A[a]), proxyState));
+ records.push(A(subdomainName, IP(domainData.record.A[a]), proxyState));
}
}
// Handle AAAA records
if (domainData.record.AAAA) {
for (var aaaa in domainData.record.AAAA) {
- commit.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState));
+ records.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState));
}
}
@@ -38,7 +38,7 @@ for (var subdomain in domains) {
if (domainData.record.CAA) {
for (var caa in domainData.record.CAA) {
var caaRecord = domainData.record.CAA[caa];
- commit.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value));
+ records.push(CAA(subdomainName, caaRecord.flags, caaRecord.tag, caaRecord.value));
}
}
@@ -46,28 +46,28 @@ for (var subdomain in domains) {
if (domainData.record.CNAME) {
// Allow CNAME record on root
if (subdomainName === "@") {
- commit.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState));
+ records.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState));
} else {
- commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState));
+ records.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState));
}
}
// Handle DS records
if (domainData.record.DS) {
- commit.push(DS(subdomainName, domainData.record.DS.key_tag, domainData.record.DS.algorithm, domainData.record.DS.digest_type, domainData.record.DS.digest));
+ records.push(DS(subdomainName, domainData.record.DS.key_tag, domainData.record.DS.algorithm, domainData.record.DS.digest_type, domainData.record.DS.digest));
}
// Handle MX records
if (domainData.record.MX) {
for (var mx in domainData.record.MX) {
- commit.push(MX(subdomainName, 10 + parseInt(mx), domainData.record.MX[mx] + "."));
+ records.push(MX(subdomainName, 10 + parseInt(mx), domainData.record.MX[mx] + "."));
}
}
// Handle NS records
if (domainData.record.NS) {
for (var ns in domainData.record.NS) {
- commit.push(NS(subdomainName, domainData.record.NS[ns] + "."));
+ records.push(NS(subdomainName, domainData.record.NS[ns] + "."));
}
}
@@ -75,7 +75,7 @@ for (var subdomain in domains) {
if (domainData.record.SRV) {
for (var srv in domainData.record.SRV) {
var srvRecord = domainData.record.SRV[srv];
- commit.push(SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + "."));
+ records.push(SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + "."));
}
}
@@ -83,34 +83,38 @@ for (var subdomain in domains) {
if (domainData.record.TXT) {
if (Array.isArray(domainData.record.TXT)) {
for (var txt in domainData.record.TXT) {
- commit.push(TXT(subdomainName, domainData.record.TXT[txt]));
+ records.push(TXT(subdomainName, domainData.record.TXT[txt]));
}
} else {
- commit.push(TXT(subdomainName, domainData.record.TXT));
+ records.push(TXT(subdomainName, domainData.record.TXT));
}
}
// Handle URL records
if (domainData.record.URL) {
- commit.push(A(subdomainName, IP("192.0.2.1"), { cloudflare_proxy: "on" }));
+ records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
}
// Handle reserved domains
if (domainData.reserved) {
- commit.push(TXT(subdomainName, "RESERVED"));
+ records.push(TXT(subdomainName, "RESERVED"));
}
}
-// Exceptions
-commit.push(IGNORE("@", "MX,TXT"));
-commit.push(IGNORE("\\*"));
-commit.push(IGNORE("_acme-challenge", "TXT"));
-commit.push(IGNORE("_autodiscover._tcp", "SRV"));
-commit.push(IGNORE("_dmarc", "TXT"));
-commit.push(IGNORE("autoconfig", "CNAME"));
-commit.push(IGNORE("autodiscover", "CNAME"));
-commit.push(IGNORE("dkim._domainkey", "TXT"));
-commit.push(IGNORE("ns[1-5]", "A,AAAA"));
+var defaults = DEFAULTS(
+ CF_PROXY_DEFAULT_OFF,
+ DefaultTTL("1h")
+);
-// Commit all DNS records
-D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), commit);
+var ignored = [
+ IGNORE("@", "MX,TXT"),
+ IGNORE("\\*"),
+ IGNORE("_acme-challenge", "TXT"),
+ IGNORE("_autodiscover._tcp", "SRV"),
+ IGNORE("_dmarc", "TXT"),
+ IGNORE("autoconfig", "CNAME"),
+ IGNORE("autodiscover", "CNAME"),
+ IGNORE("dkim._domainkey", "TXT")
+]
+
+D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), defaults, ignored, records);
From eaea3becda1fe49ce804a99d236ef2fdd900471c Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:28:49 +0800
Subject: [PATCH 06/17] Update CODEOWNERS
---
.github/CODEOWNERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 07ba168b9..a4788b050 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,4 +5,4 @@
*.md @is-a-dev/maintainers
/LICENSE @phenax
-/dnsconfig.js @wdhdev @andrewstech
+/dnsconfig.js @wdhdev
From 565826074d914e0b75db36fcad043e5ccac145cc Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:30:13 +0800
Subject: [PATCH 07/17] remove defaults
---
dnsconfig.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index 0be763602..a7e5d2bbc 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -101,11 +101,6 @@ for (var subdomain in domains) {
}
}
-var defaults = DEFAULTS(
- CF_PROXY_DEFAULT_OFF,
- DefaultTTL("1h")
-);
-
var ignored = [
IGNORE("@", "MX,TXT"),
IGNORE("\\*"),
@@ -117,4 +112,4 @@ var ignored = [
IGNORE("dkim._domainkey", "TXT")
]
-D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), defaults, ignored, records);
+D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), ignored, records);
From 1169b05a645e42af04e12825be3bf4f2d68d63ce Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:37:11 +0800
Subject: [PATCH 08/17] Update publish.yml
---
.github/workflows/publish.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0bd1f89ca..21b4b18c8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v4
- name: Generate creds.json
- run: echo '{"cloudflare":{"TYPE":"CLOUDFLAREAPI","apitoken":"$CLOUDFLARE_API_TOKEN"}}' > ./creds.json
+ run: echo '{"cloudflare":{"TYPE":"CLOUDFLAREAPI","apitoken":"$CLOUDFLARE_API_TOKEN"},"no_ns":"true"}' > ./creds.json
- name: Publish
uses: is-a-dev/dnscontrol-action@main
From cad8f20083e9b0e602625fe20f0ad31f79a7b2e2 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:43:15 +0800
Subject: [PATCH 09/17] Update publish.yml
---
.github/workflows/publish.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 21b4b18c8..0bd1f89ca 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v4
- name: Generate creds.json
- run: echo '{"cloudflare":{"TYPE":"CLOUDFLAREAPI","apitoken":"$CLOUDFLARE_API_TOKEN"},"no_ns":"true"}' > ./creds.json
+ run: echo '{"cloudflare":{"TYPE":"CLOUDFLAREAPI","apitoken":"$CLOUDFLARE_API_TOKEN"}}' > ./creds.json
- name: Publish
uses: is-a-dev/dnscontrol-action@main
From 5443250e92aaca12d8ba383cc3de9f5a9b429b0d Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:43:41 +0800
Subject: [PATCH 10/17] Update dnsconfig.js
---
dnsconfig.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index a7e5d2bbc..34e352e8e 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -112,4 +112,4 @@ var ignored = [
IGNORE("dkim._domainkey", "TXT")
]
-D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), ignored, records);
+D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0, { no_ns: true }), ignored, records);
From a3fd35c3dced69a59f11aba66aa44e91c82070e3 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:46:12 +0800
Subject: [PATCH 11/17] Update dnsconfig.js
---
dnsconfig.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index 34e352e8e..f45299ce8 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -112,4 +112,4 @@ var ignored = [
IGNORE("dkim._domainkey", "TXT")
]
-D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0, { no_ns: true }), ignored, records);
+D("is-a.dev", NewRegistrar("none", { no_ns: true }), DnsProvider(NewDnsProvider("cloudflare"), 0), ignored, records);
From d2245701a36a3267e09ec7ba938f2e7805981d43 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:51:46 +0800
Subject: [PATCH 12/17] Update dnsconfig.js
---
dnsconfig.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dnsconfig.js b/dnsconfig.js
index f45299ce8..57187401c 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -112,4 +112,4 @@ var ignored = [
IGNORE("dkim._domainkey", "TXT")
]
-D("is-a.dev", NewRegistrar("none", { no_ns: true }), DnsProvider(NewDnsProvider("cloudflare"), 0), ignored, records);
+D("is-a.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare"), 0), { no_ns: 'true'}, ignored, records);
From db34553ba43b728cbedf6ddbb4a567a1c703052e Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:52:07 +0800
Subject: [PATCH 13/17] remove raw api badge
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 3088b23d5..98f1a6fff 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@
-