diff --git a/dnsconfig.js b/dnsconfig.js index a384579..3d06bcc 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -17,7 +17,7 @@ var proxy = { * domain: string, * subdomain: string, * owner?: { email?: string }, - * records: { A?: string[], AAAA?: string[], CNAME?: string, MX?: object[], NS?: string[], TXT?: string[] }, + * records: { A?: string[], AAAA?: string[], CNAME?: string, MX?: object[], NS?: string[], TXT?: object[] }, * proxied: boolean * }}[]} */ @@ -96,7 +96,7 @@ for (var idx in domains) { if (domainData.records.TXT) { for (var txt in domainData.records.TXT) { commit[domainData.domain].push( - TXT(domainData.subdomain, domainData.records.TXT[txt]) + TXT(domainData.records.TXT[txt].name + "." + domainData.subdomain, domainData.records.TXT[txt].value) ); } } diff --git a/domains/reserved/_github-challenge-free-domains-org.is-a-backend.dev.json b/domains/reserved/_github-challenge-free-domains-org.is-a-backend.dev.json index e32387b..3d4260b 100644 --- a/domains/reserved/_github-challenge-free-domains-org.is-a-backend.dev.json +++ b/domains/reserved/_github-challenge-free-domains-org.is-a-backend.dev.json @@ -5,7 +5,12 @@ "subdomain": "_github-challenge-free-domains-org", "records": { - "TXT": ["d9d7d3b3cd"] + "TXT": [ + { + "name": "@", + "value": "d9d7d3b3cd" + } + ] }, "proxied": false diff --git a/domains/reserved/_github-challenge-free-domains-org.is-a-frontend.dev.json b/domains/reserved/_github-challenge-free-domains-org.is-a-frontend.dev.json index 1f55d80..9463f3a 100644 --- a/domains/reserved/_github-challenge-free-domains-org.is-a-frontend.dev.json +++ b/domains/reserved/_github-challenge-free-domains-org.is-a-frontend.dev.json @@ -5,7 +5,12 @@ "subdomain": "_github-challenge-free-domains-org", "records": { - "TXT": ["b5822037c3"] + "TXT": [ + { + "name": "@", + "value": "b5822037c3" + } + ] }, "proxied": false diff --git a/domains/reserved/_github-pages-challenge-free-domains.is-a-backend.dev.json b/domains/reserved/_github-pages-challenge-free-domains.is-a-backend.dev.json index c5fd91e..67722de 100644 --- a/domains/reserved/_github-pages-challenge-free-domains.is-a-backend.dev.json +++ b/domains/reserved/_github-pages-challenge-free-domains.is-a-backend.dev.json @@ -5,7 +5,12 @@ "subdomain": "_github-pages-challenge-free-domains", "records": { - "TXT": ["2b1d1bccb97af4e747c6f48dd903ff"] + "TXT": [ + { + "name": "@", + "value": "2b1d1bccb97af4e747c6f48dd903ff" + } + ] }, "proxied": false diff --git a/domains/reserved/_github-pages-challenge-free-domains.is-a-frontend.dev.json b/domains/reserved/_github-pages-challenge-free-domains.is-a-frontend.dev.json index a4a0258..ba4ba65 100644 --- a/domains/reserved/_github-pages-challenge-free-domains.is-a-frontend.dev.json +++ b/domains/reserved/_github-pages-challenge-free-domains.is-a-frontend.dev.json @@ -5,7 +5,12 @@ "subdomain": "_github-pages-challenge-free-domains", "records": { - "TXT": ["48ff7988789c1fb49dd4be28c0fe70"] + "TXT": [ + { + "name": "@", + "value": "48ff7988789c1fb49dd4be28c0fe70" + } + ] }, "proxied": false diff --git a/domains/reserved/is-a-backend.dev.json b/domains/reserved/is-a-backend.dev.json index d29c525..a76ff43 100644 --- a/domains/reserved/is-a-backend.dev.json +++ b/domains/reserved/is-a-backend.dev.json @@ -36,7 +36,12 @@ } ], - "TXT": ["v=spf1 include:_spf.mx.cloudflare.net ~all"] + "TXT": [ + { + "name": "@", + "value": "v=spf1 include:_spf.mx.cloudflare.net ~all" + } + ] }, "proxied": false diff --git a/domains/reserved/is-a-frontend.dev.json b/domains/reserved/is-a-frontend.dev.json index c99dac6..aeac7a4 100644 --- a/domains/reserved/is-a-frontend.dev.json +++ b/domains/reserved/is-a-frontend.dev.json @@ -36,7 +36,12 @@ } ], - "TXT": ["v=spf1 include:_spf.mx.cloudflare.net ~all"] + "TXT": [ + { + "name": "@", + "value": "v=spf1 include:_spf.mx.cloudflare.net ~all" + } + ] }, "proxied": false diff --git a/schemas/domain.json b/schemas/domain.json index aca1337..63c1e2a 100644 --- a/schemas/domain.json +++ b/schemas/domain.json @@ -51,9 +51,9 @@ "TXT": { "type": "array", "items": { - "type": "string", - "minLength": 1, - "maxLength": 255 + "type": "object", + "minProperties": 2, + "maxProperties": 2 } } }, diff --git a/schemas/reserved-domain.json b/schemas/reserved-domain.json index 4af30e1..1f755c7 100644 --- a/schemas/reserved-domain.json +++ b/schemas/reserved-domain.json @@ -44,6 +44,7 @@ "type": "object", "minLength": 3, "pattern": "^[a-z0-9._-]{3,}$", + "minProperties": 2, "maxProperties": 2 } }, @@ -58,9 +59,9 @@ "TXT": { "type": "array", "items": { - "type": "string", - "minLength": 1, - "maxLength": 255 + "type": "object", + "minProperties": 2, + "maxProperties": 2 } } },