all repos — dns @ d25a7b0b91f5d26ac7ff6eac78f7b9fd883d4f2e

DNS records for my domains, managed via dnscontrol

use and improve fly helper function

Alin
commit

d25a7b0b91f5d26ac7ff6eac78f7b9fd883d4f2e

parent

915d8f55ab644a3b04bc1f20ffce9d2c20660ecb

1 file changed, 35 insertions(+), 18 deletions(-)

changed files
M dnsconfig.jsdnsconfig.js
@@ -25,6 +25,17 @@ return target.endsWith('.') ? target : target + '.'
} /** + * @param {string} target + * @param {string} prefix + */ +function prefix(target, prefix) { + return target === '@' + ? prefix + : prefix + '.' + target + +} + +/** * @param {string} name * @param {string} acmeTarget */
@@ -38,17 +49,26 @@ }
/** * @param {string} name - * @param {string} [acmeTarget] + * @param {RecordModifier[]} [modifiers] */ -function fly(name, acmeTarget) { +function fly(name, modifiers) { + var ownershipValue = 'app-d8rdp9j'; + var flyApp = 'd8rdp9j.flynet-butterfly-1123.fly.dev.' + + var rec = name === '@' ? ALIAS : CNAME + var primary = rec.bind(null, name, flyApp) + var records = [ - ALIAS(name, 'alanpearce-eu.fly.dev.'), - HTTPS(name, 1, 'alanpearce-eu.fly.dev.', https({ - alpn: ['h2'], - })), + primary.apply(null, modifiers), + TXT.bind(null, prefix(name, '_fly-ownership'), ownershipValue).apply(null, modifiers), ] - if (acmeTarget != null) { - records.push(acmeDelegate(name, acmeTarget)) + + if (rec === ALIAS) { + records.push( + HTTPS.bind(null, name, 1, flyApp, https({ + alpn: ['h2'], + })).apply(null, modifiers), + ) } return records
@@ -161,8 +181,7 @@ issuemail: ['none'],
issuevmc: ['none'] }), - link('@', 'flynet-butterfly-1123.fly.dev.', [TTL('1h')]), - HTTPS('@', 1, 'flynet-butterfly-1123.fly.dev.', https({ alpn: ['h2'], }), TTL('1h')), + fly('@', [TTL('1h')]), HTTPS('@', 10, 'homestead-homestead488.danubedata.run.', https({ alpn: ['h2'], }), TTL('1h')), // acmeDelegate('@', '019dbafc-1535-723a-a7f4-1767cc565d5f._acme.danubedata.run.'),
@@ -210,16 +229,15 @@ issuemail: ['none'],
issuevmc: ['none'] }), - link('@', 'flynet-butterfly-1123.fly.dev.', [TTL('1h')]), - HTTPS('@', 1, 'flynet-butterfly-1123.fly.dev.', https({ alpn: ['h2'], }), TTL('1h')), + fly('@', [TTL('1h')]), HTTPS('@', 10, 'homestead-homestead488.danubedata.run.', https({ alpn: ['h2'], }), TTL('1h')), // acmeDelegate('@', '019dbafd-3673-705c-a3c8-177f3e1df556._acme.danubedata.run.'), + + TXT('_danubedata-verify', 'ef62ca764cbd0a8520add9cb0a95ee04ff34c1214634cc310fbdd2114a8ac16a'), netlify('www'), - bulkCNAME([ - 'status', - ], 'flynet-butterfly-1123.fly.dev.'), + fly('status'), bulkCNAME([ 'binarycache',
@@ -366,13 +384,12 @@
soa, nameservers, - link('@', 'flynet-butterfly-1123.fly.dev.', [TTL('1h')]), - HTTPS('@', 1, 'flynet-butterfly-1123.fly.dev.', https({ alpn: ['h2'], }), TTL('1h')), + fly('@', [TTL('1h')]), HTTPS('@', 10, 'smrk.alin.ovh.', 'alpn=h3,h2', TTL('1h')), CNAME('stats', 'smrk.alin.ovh.'), - CNAME('stable', 'flynet-butterfly-1123.fly.dev.', TTL('1h')), + fly('stable', [TTL('1h')]), CNAME('stats.stable', 'smrk.alin.ovh.'), CNAME('status', 'cname.status.phare.io.') )