diff --git a/terraform/dns_dnsimple_zones.tf b/terraform/dns_dnsimple_zones.tf index 9fb2ad6..3d150f0 100644 --- a/terraform/dns_dnsimple_zones.tf +++ b/terraform/dns_dnsimple_zones.tf @@ -3,18 +3,10 @@ resource "dnsimple_zone" "gridmap_org" { name = "gridmap.org" } -resource "dnsimple_zone" "manero_org" { - name = "manero.org" -} - -resource "dnsimple_zone" "mcintire_me" { - name = "mcintire.me" -} +# resource "dnsimple_zone" "mcintire_me" { +# name = "mcintire.me" +# } resource "dnsimple_zone" "vntx_net" { name = "vntx.net" } - -resource "dnsimple_zone" "vntx_org" { - name = "vntx.org" -} diff --git a/terraform/dns_manero.tf b/terraform/dns_manero.tf index b4424ec..d02f8b3 100644 --- a/terraform/dns_manero.tf +++ b/terraform/dns_manero.tf @@ -1,79 +1,80 @@ -resource "dnsimple_zone_record" "manero_root_a_1" { - zone_name = "manero.org" - name = "@" - value = "185.199.108.153" - type = "A" - ttl = 3600 +# PowerDNS records for manero.org +# Zone defined in dns_powerdns_zones.tf + +resource "powerdns_record" "manero_soa" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "manero.org." + type = "SOA" + ttl = 3600 + records = ["ns1.as393837.net. graham.mcintire.me. 0 10800 3600 604800 3600"] } -resource "dnsimple_zone_record" "manero_root_a_2" { - zone_name = "manero.org" - name = "@" - value = "185.199.109.153" - type = "A" - ttl = 3600 +# Root A records (GitHub Pages) +resource "powerdns_record" "manero_root_a" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "manero.org." + type = "A" + ttl = 3600 + records = [ + "185.199.108.153", + "185.199.109.153", + "185.199.110.153", + "185.199.111.153" + ] } -resource "dnsimple_zone_record" "manero_root_a_3" { - zone_name = "manero.org" - name = "@" - value = "185.199.110.153" - type = "A" - ttl = 3600 +resource "powerdns_record" "manero_irc_a" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "irc.manero.org." + type = "A" + ttl = 3600 + records = ["149.28.242.178"] } -resource "dnsimple_zone_record" "manero_root_a_4" { - zone_name = "manero.org" - name = "@" - value = "185.199.111.153" - type = "A" - ttl = 3600 +resource "powerdns_record" "manero_us_a" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "us.manero.org." + type = "A" + ttl = 3600 + records = ["149.28.242.178"] } -resource "dnsimple_zone_record" "manero_irc_a" { - zone_name = "manero.org" - name = "irc" - value = "149.28.242.178" - type = "A" - ttl = 3600 +resource "powerdns_record" "manero_us_aaaa" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "us.manero.org." + type = "AAAA" + ttl = 3600 + records = ["2001:19f0:6401:19e6:5400:5ff:fe45:5701"] } -resource "dnsimple_zone_record" "manero_us_a" { - zone_name = "manero.org" - name = "us" - value = "149.28.242.178" - type = "A" - ttl = 3600 +resource "powerdns_record" "manero_ca_a" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "ca.manero.org." + type = "A" + ttl = 3600 + records = ["167.114.209.151"] } -resource "dnsimple_zone_record" "manero_us_aaaa" { - zone_name = "manero.org" - name = "us" - value = "2001:19f0:6401:19e6:5400:5ff:fe45:5701" - type = "AAAA" - ttl = 3600 +resource "powerdns_record" "manero_tankfox_a" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "tankfox.manero.org." + type = "A" + ttl = 3600 + records = ["137.184.202.89"] } -resource "dnsimple_zone_record" "manero_ca_a" { - zone_name = "manero.org" - name = "ca" - value = "167.114.209.151" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "manero_tankfox_a" { - zone_name = "manero.org" - name = "tankfox" - value = "137.184.202.89" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "manero_404" { - zone_name = "manero.org" - name = "404" - value = "404.al" - type = "CNAME" - ttl = 3600 +resource "powerdns_record" "manero_404_cname" { + depends_on = [powerdns_zone.manero_org] + zone = "manero.org." + name = "404.manero.org." + type = "CNAME" + ttl = 3600 + records = ["404.al."] } diff --git a/terraform/dns_mcintire.tf b/terraform/dns_mcintire.tf index 7058664..9eb1058 100644 --- a/terraform/dns_mcintire.tf +++ b/terraform/dns_mcintire.tf @@ -116,21 +116,3 @@ resource "powerdns_record" "mcintire_photos" { ttl = 3600 records = ["204.110.191.8"] } - -resource "powerdns_record" "mcintire_headscale" { - depends_on = [powerdns_zone.mcintire_me] - zone = "mcintire.me." - name = "headscale.mcintire.me." - type = "A" - ttl = 3600 - records = ["66.206.18.166"] -} - -resource "powerdns_record" "mcintire_hs" { - depends_on = [powerdns_zone.mcintire_me] - zone = "mcintire.me." - name = "hs.mcintire.me." - type = "A" - ttl = 3600 - records = ["66.206.18.166"] -} diff --git a/terraform/dns_mcintire_dnsimple_TEMP.tf b/terraform/dns_mcintire_dnsimple_TEMP.tf deleted file mode 100644 index e35d743..0000000 --- a/terraform/dns_mcintire_dnsimple_TEMP.tf +++ /dev/null @@ -1,118 +0,0 @@ -# DNS configuration for mcintire.me domain (DNSimple) -# Mail records point to Mailcow on mail.w5isp.com - -# Note: DNSimple manages SOA automatically, no need to define it - -# Mailcow MX records -resource "dnsimple_zone_record" "mcintire_mx_mailcow" { - zone_name = "mcintire.me" - name = "" - value = "mail.w5isp.com." - type = "MX" - ttl = 3600 - priority = 10 -} - -resource "dnsimple_zone_record" "mcintire_mx_backup" { - zone_name = "mcintire.me" - name = "" - value = "mail.nsnw.ca." - type = "MX" - ttl = 3600 - priority = 20 -} - -resource "dnsimple_zone_record" "mcintire_cname_test" { - zone_name = "mcintire.me" - name = "*.test" - value = "cname.bookappt.link." - type = "CNAME" - ttl = 14400 -} - -# Mail server -resource "dnsimple_zone_record" "mcintire_mail" { - zone_name = "mcintire.me" - name = "mail" - value = "204.110.191.5" - type = "A" - ttl = 3600 -} - -# Autodiscover for mail clients -resource "dnsimple_zone_record" "mcintire_autodiscover" { - zone_name = "mcintire.me" - name = "autodiscover" - value = "mail.w5isp.com." - type = "CNAME" - ttl = 3600 -} - -# Autodiscover SRV record -resource "dnsimple_zone_record" "mcintire_autodiscover_srv" { - zone_name = "mcintire.me" - name = "_autodiscover._tcp" - value = "0 0 443 mail.w5isp.com." - type = "SRV" - ttl = 3600 -} - -# Autoconfig for mail clients -resource "dnsimple_zone_record" "mcintire_autoconfig" { - zone_name = "mcintire.me" - name = "autoconfig" - value = "mail.w5isp.com." - type = "CNAME" - ttl = 3600 -} - -# SPF record for Mailcow -resource "dnsimple_zone_record" "mcintire_spf_mailcow" { - zone_name = "mcintire.me" - name = "" - value = "v=spf1 mx a ip4:204.110.191.5 ~all" - type = "TXT" - ttl = 3600 -} - -# DMARC record for Mailcow -resource "dnsimple_zone_record" "mcintire_dmarc_mailcow" { - zone_name = "mcintire.me" - name = "_dmarc" - value = "v=DMARC1; p=quarantine; rua=mailto:postmaster@mcintire.me; ruf=mailto:postmaster@mcintire.me; fo=1" - type = "TXT" - ttl = 3600 -} - -# DKIM record from Mailcow -resource "dnsimple_zone_record" "mcintire_dkim_mailcow" { - zone_name = "mcintire.me" - name = "dkim._domainkey" - value = "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0rQie7Hz5AmDbVUX+rKNgp6Hf7crtWyfy6qKbqnrxmmernz1rQ6HyOrHhFAlc8nVLNKr8XP2DOROb1jAnrjndZo9I/ymbrrrCBsi9w6zAht2BheijO/R9k5CDRjeSafm6bg0oMKihtNMIdXvEj9ND8hDpZZKxtOrKFH7zLm4CPmm7jf0gqZH2yK+AA3OYUGSYa1OT0LtdMXadk0IVOI2VYf37Hzb3RUvGOYMVkT0xi+23DiyFk7AyCiyv3LQVBMT+/bwyd4k3yVVn2cr9+Nor+HXVjqASLtqcFLMf1SuX0ezSAjBG7BbqQr5G6Jz+n5YglqEIUKVYzJFE7JdDmqQYQIDAQAB" - type = "TXT" - ttl = 3600 -} - -resource "dnsimple_zone_record" "mcintire_photos" { - zone_name = "mcintire.me" - name = "photos" - value = "204.110.191.8" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "mcintire_headscale" { - zone_name = "mcintire.me" - name = "headscale" - value = "66.206.18.166" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "mcintire_hs" { - zone_name = "mcintire.me" - name = "hs" - value = "66.206.18.166" - type = "A" - ttl = 3600 -} diff --git a/terraform/dns_powerdns_zones.tf b/terraform/dns_powerdns_zones.tf index a34964b..8db611d 100644 --- a/terraform/dns_powerdns_zones.tf +++ b/terraform/dns_powerdns_zones.tf @@ -1,7 +1,7 @@ # Vultr PowerDNS Zones # All zones managed on the Vultr PowerDNS instance -resource "powerdns_zone" "w5isp" { +resource "powerdns_zone" "w5isp_com" { name = "w5isp.com." kind = "Native" soa_edit_api = "DEFAULT" @@ -64,3 +64,10 @@ resource "powerdns_zone" "vntx_org" { soa_edit_api = "DEFAULT" nameservers = ["ns1.as393837.net.", "ns-global.kjsl.com."] } + +resource "powerdns_zone" "manero_org" { + name = "manero.org." + kind = "Native" + soa_edit_api = "DEFAULT" + nameservers = ["ns1.as393837.net.", "ns-global.kjsl.com."] +} diff --git a/terraform/dns_vntx_net.tf b/terraform/dns_vntx_net.tf index 1f4b374..7e8c8c8 100644 --- a/terraform/dns_vntx_net.tf +++ b/terraform/dns_vntx_net.tf @@ -1,3 +1,13 @@ +# SOA record for vntx.net +resource "powerdns_record" "vntx_net_soa" { + depends_on = [powerdns_zone.vntx_net] + zone = "vntx.net." + name = "vntx.net." + type = "SOA" + ttl = 3600 + records = ["ns1.as393837.net. graham.mcintire.me. 0 10800 3600 604800 3600"] +} + resource "powerdns_record" "vntx_a_records" { for_each = { # Subnet: 204.110.188.0/24 diff --git a/terraform/dns_vntx_net_porkbun_TEMP.tf b/terraform/dns_vntx_net_porkbun_TEMP.tf deleted file mode 100644 index ad9f4c4..0000000 --- a/terraform/dns_vntx_net_porkbun_TEMP.tf +++ /dev/null @@ -1,85 +0,0 @@ -# TEMPORARY FILE - vntx.net Porkbun configuration -# Forward records for reverse DNS zones removed (*.client A records) -# Contains TXT and CNAME records only - -resource "porkbun_dns_record" "vntx_txt_records" { - for_each = { - "_twilio" = "twilio-domain-verification=12bf63d61b86412618bdb4ab6c2b287a" - "_dmarc" = "v=DMARC1; p=none" - "_updown" = "updown-page=p/34yuc" - "_github-challenge-vntx" = "34ea2705e4" - "_github-pages-challenge-gmcintire" = "d125f4244edd0120ee0fa073d3acf1" - "krs._domainkey.mg" = "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHbWtJ5uPGEOPmJrT36WBXKxVL0b4fqjIM4n6oXK4zaUucqYp7jeoKG+FTO5XEjyja7hsP9WahntUrVb8WI5V6Cj0CznesMrM7oQRntcyuy8mSD1zilmZe4q2Kc65gj2MRrkg3tkJfogXHNz2rxmquNu/DxsFLeQP8a2E5tYXVFwIDAQAB" - "mandrill._domainkey" = "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrLHiExVd55zd/IQ/J/mRwSRMAocV/hMB3jXwaHH36d9NaVynQFYV8NaWi69c1veUtRzGt7yAioXqLj7Z4TeEUoOLgrKsn8YnckGs9i3B3tVFB+Ch/4mPhXWiNfNdynHWBcPcbJ8kjEQ2U8y78dHZj1YeRXXVvWob2OaKynO8/lQIDAQAB;" - "mg" = "v=spf1 include:mailgun.org ~all" - "o365" = "v=spf1 include:spf.protection.outlook.com -all" - "spf" = "v=spf1 include:_spf.google.com include:spf.mandrillapp.com ~all" - "@" = "google-site-verification=RD-gYkKRPw1TSIzHRAuJljZ7Xee6uDGGkFvL6XmSjs0" - "detectify-verification" = "7c06e001f2f39c59564baabd497360e2" - "keybase-site-verification" = "xNV8FawC3MsGF70UNFKaKQUUOyQvjeL0DMK_RMQQ-_Q" - "MS" = "ms84271221" - "have-i-been-pwned-verification" = "beb9c178a27aaaaa007c4c84d64dccf5" - } - - domain = "vntx.net" - name = each.key - content = each.value - type = "TXT" - ttl = 3600 - priority = 0 -} - -# resource "porkbun_dns_record" "vntx_srv1" { -# domain = "vntx.net" -# name = "_sipfederationtls._tcp.o365" -# type = "SRV" -# priority = 100 -# content = "5061 sipfed.online.lync.com." -# ttl = 3600 -# } - - -# SRV("_sip._tls.o365", 100, 1, 443, "sipdir.online.lync.com.", TTL(3600)), - -resource "porkbun_dns_record" "vntx_cname_records" { - for_each = { - "mte1._domainkey" = "dkim1.mandrillapp.com." - "mte2._domainkey" = "dkim2.mandrillapp.com." - "em924886" = "return.smtp2go.net." - "s924886._domainkey" = "dkim.smtp2go.net." - "link" = "track.smtp2go.net." - "_83337805c305955c6823504cc5e6ca29" = "_baf97cdcc7b6458fa5719e4261e9932f.sdgjtdhdhz.acm-validations.aws." - "activate" = "verona-networks-checkout.gaiia-consumer.com." - "portal" = "verona-networks-clientportal.gaiia-consumer.com." - "url9812" = "sendgrid.net." - "url62" = "sendgrid.net." - "177982" = "sendgrid.net." - "_4080c249b6e72dd04f2a9508aa1a1b7f.kivrak" = "_de3e5d511f3869bbd271b935a3b4f973.tljzshvwok.acm-validations.aws." - "4809fce066c3da4d14197c7276ba083f.irc" = "b58bf151af520d34d8fad99d05274cb536893031.comodoca.com." - "9p83fpanfdgs8xdgcnzd" = "verify.squarespace.com." - "autodiscover.o365" = "autodiscover.outlook.com." - "autodiscover" = "autodiscover.outlook.com." - "_bc1077259b1fbbb11c1e16756e1883f9.irc" = "793f217a963b25f361ec1975e0fd7d54.dc2ec86a36550aed25a0011c0b2b044b.62f7abe714ec1.comodoca.com." - "em9279" = "u177982.wl233.sendgrid.net." - "email.mg" = "mailgun.org." - "email" = "mandrillapp.com." - "enterpriseenrollment.o365" = "enterpriseenrollment.manage.microsoft.com." - "enterpriseregistration.o365" = "enterpriseregistration.windows.net." - "lyncdiscover.o365" = "webdir.online.lync.com." - "s1._domainkey" = "s1.domainkey.u177982.wl233.sendgrid.net." - "s2._domainkey" = "s2.domainkey.u177982.wl233.sendgrid.net." - "sip.o365" = "sipdir.online.lync.com." - "www" = "ext-cust.squarespace.com." - "uptime" = "page.updown.io." - "status" = "stats.uptimerobot.com." - "ntp" = "0.us.pool.ntp.org." - "iptrack" = "dokku.w5isp.com." - } - - domain = "vntx.net" - name = each.key - content = each.value - type = "CNAME" - ttl = 3600 - priority = 0 -} diff --git a/terraform/dns_vntx_org.tf b/terraform/dns_vntx_org.tf new file mode 100644 index 0000000..b5ff35a --- /dev/null +++ b/terraform/dns_vntx_org.tf @@ -0,0 +1,12 @@ +# DNS records for vntx.org domain +# Zone defined in dns_powerdns_zones.tf + +# SOA record for vntx.org +resource "powerdns_record" "vntx_org_soa" { + depends_on = [powerdns_zone.vntx_org] + zone = "vntx.org." + name = "vntx.org." + type = "SOA" + ttl = 3600 + records = ["ns1.as393837.net. graham.mcintire.me. 0 10800 3600 604800 3600"] +} diff --git a/terraform/dns_w5isp.tf b/terraform/dns_w5isp.tf index d04ae7c..080119b 100644 --- a/terraform/dns_w5isp.tf +++ b/terraform/dns_w5isp.tf @@ -1,5 +1,5 @@ resource "powerdns_record" "w5isp_soa" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "w5isp.com." type = "SOA" @@ -8,7 +8,7 @@ resource "powerdns_record" "w5isp_soa" { } resource "powerdns_record" "w5isp_root" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "w5isp.com." type = "A" @@ -17,7 +17,7 @@ resource "powerdns_record" "w5isp_root" { } resource "powerdns_record" "w5isp_git" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "git.w5isp.com." type = "A" @@ -26,7 +26,7 @@ resource "powerdns_record" "w5isp_git" { } resource "powerdns_record" "w5isp_home" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "home.w5isp.com." type = "A" @@ -35,7 +35,7 @@ resource "powerdns_record" "w5isp_home" { } resource "powerdns_record" "w5isp_photos" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "photos.w5isp.com." type = "A" @@ -44,7 +44,7 @@ resource "powerdns_record" "w5isp_photos" { } resource "powerdns_record" "w5isp_skippy" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "skippy.w5isp.com." type = "A" @@ -53,7 +53,7 @@ resource "powerdns_record" "w5isp_skippy" { } resource "powerdns_record" "w5isp_ha" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "ha.w5isp.com." type = "CNAME" @@ -62,7 +62,7 @@ resource "powerdns_record" "w5isp_ha" { } resource "powerdns_record" "w5isp_mx1" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "w5isp.com." type = "MX" @@ -71,7 +71,7 @@ resource "powerdns_record" "w5isp_mx1" { } resource "powerdns_record" "w5isp_txt" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "w5isp.com." type = "TXT" @@ -81,7 +81,7 @@ resource "powerdns_record" "w5isp_txt" { # DKIM record resource "powerdns_record" "w5isp_dkim" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "dkim._domainkey.w5isp.com." type = "TXT" @@ -90,7 +90,7 @@ resource "powerdns_record" "w5isp_dkim" { } resource "powerdns_record" "w5isp_g" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "g.w5isp.com." type = "A" @@ -99,7 +99,7 @@ resource "powerdns_record" "w5isp_g" { } resource "powerdns_record" "w5isp_truck" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "truck.w5isp.com." type = "CNAME" @@ -108,7 +108,7 @@ resource "powerdns_record" "w5isp_truck" { } resource "powerdns_record" "w5isp_sendgrid1" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "em40.w5isp.com." type = "CNAME" @@ -117,7 +117,7 @@ resource "powerdns_record" "w5isp_sendgrid1" { } resource "powerdns_record" "w5isp_sendgrid2" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "s1._domainkey.w5isp.com." type = "CNAME" @@ -126,7 +126,7 @@ resource "powerdns_record" "w5isp_sendgrid2" { } resource "powerdns_record" "w5isp_sendgrid3" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "s2._domainkey.w5isp.com." type = "CNAME" @@ -135,7 +135,7 @@ resource "powerdns_record" "w5isp_sendgrid3" { } resource "powerdns_record" "w5isp_dmarc" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "_dmarc.w5isp.com." type = "TXT" @@ -145,7 +145,7 @@ resource "powerdns_record" "w5isp_dmarc" { # Mail server resource "powerdns_record" "w5isp_mail" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "mail.w5isp.com." type = "A" @@ -154,7 +154,7 @@ resource "powerdns_record" "w5isp_mail" { } resource "powerdns_record" "w5isp_sync" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "sync.w5isp.com." type = "A" @@ -163,7 +163,7 @@ resource "powerdns_record" "w5isp_sync" { } resource "powerdns_record" "w5isp_log" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "log.w5isp.com." type = "CNAME" @@ -172,7 +172,7 @@ resource "powerdns_record" "w5isp_log" { } resource "powerdns_record" "w5isp_autodiscover" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "autodiscover.w5isp.com." type = "CNAME" @@ -181,7 +181,7 @@ resource "powerdns_record" "w5isp_autodiscover" { } resource "powerdns_record" "w5isp_autodiscover_srv" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "_autodiscover._tcp.w5isp.com." type = "SRV" @@ -190,7 +190,7 @@ resource "powerdns_record" "w5isp_autodiscover_srv" { } resource "powerdns_record" "w5isp_autoconfig" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "autoconfig.w5isp.com." type = "CNAME" @@ -199,7 +199,7 @@ resource "powerdns_record" "w5isp_autoconfig" { } resource "powerdns_record" "w5isp_n8n" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "n8n.w5isp.com." type = "A" @@ -208,7 +208,7 @@ resource "powerdns_record" "w5isp_n8n" { } resource "powerdns_record" "w5isp_nodered" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "nodered.w5isp.com." type = "A" @@ -217,7 +217,7 @@ resource "powerdns_record" "w5isp_nodered" { } resource "powerdns_record" "w5isp_headscale" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "headscale.w5isp.com." type = "A" @@ -226,7 +226,7 @@ resource "powerdns_record" "w5isp_headscale" { } resource "powerdns_record" "w5isp_hs" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "hs.w5isp.com." type = "A" @@ -235,7 +235,7 @@ resource "powerdns_record" "w5isp_hs" { } resource "powerdns_record" "w5isp_dokku" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "dokku.w5isp.com." type = "A" @@ -244,7 +244,7 @@ resource "powerdns_record" "w5isp_dokku" { } resource "powerdns_record" "w5isp_camper" { - depends_on = [powerdns_zone.w5isp] + depends_on = [powerdns_zone.w5isp_com] zone = "w5isp.com." name = "camper.w5isp.com." type = "CNAME" diff --git a/terraform/dns_w5isp_dnsimple_TEMP.tf b/terraform/dns_w5isp_dnsimple_TEMP.tf deleted file mode 100644 index b6abf40..0000000 --- a/terraform/dns_w5isp_dnsimple_TEMP.tf +++ /dev/null @@ -1,226 +0,0 @@ -# TEMPORARY FILE - w5isp.com DNSimple configuration -# This is a backup/reference of w5isp.com in DNSimple format - -resource "dnsimple_zone" "w5isp_com" { - name = "w5isp.com" -} - -resource "dnsimple_zone_record" "w5isp_root" { - zone_name = "w5isp.com" - name = "" - value = "204.110.191.5" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_git" { - zone_name = "w5isp.com" - name = "git" - value = "66.206.18.163" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_home" { - zone_name = "w5isp.com" - name = "home" - value = "204.110.191.1" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_photos" { - zone_name = "w5isp.com" - name = "photos" - value = "204.110.191.8" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_skippy" { - zone_name = "w5isp.com" - name = "skippy" - value = "204.110.191.8" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_ha" { - zone_name = "w5isp.com" - name = "ha" - value = "q1l09qiycnaagngmjsg1qas0rhqcfoou.ui.nabu.casa" - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_mx1" { - zone_name = "w5isp.com" - name = "" - priority = 10 - value = "mail.w5isp.com" - type = "MX" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_txt" { - zone_name = "w5isp.com" - name = "" - value = "v=spf1 mx a ip4:204.110.191.5 ~all" - type = "TXT" - ttl = 3600 -} - -# DKIM record -resource "dnsimple_zone_record" "w5isp_dkim" { - zone_name = "w5isp.com" - name = "dkim._domainkey" - value = "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxti2t8TvzIqKF9BpKn3rQExKg3sS1SyQuwtQgL0r/ELEJ0D9cKU/iM+eB1ROJctKHoMqKDJoRCMP6eibFcgq2kLKqf+aceEOIBx2OK2WCXML+CNqQZA6yO+A8/Jq7iFZPq8D5FmOoxbwRZkso7CkSennSz/+F7nBPI/OfyEiiI4xJzWH3t8SaAkkcy46O+1K0iCkTpsthon7E2PHa3SPkrjbep/5NImTJLK5LuffiLJtLsiK+73mvsAYCDmrNxPTaDjXkj0TWdKl/d/TnlVJl+YloqWIDt/7LtZQM0C7GZ9flIr7z9hHpSWERXAA5Gj5NQ0/hcY3nF4dPoqWs3VeeQIDAQAB" - type = "TXT" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_g" { - zone_name = "w5isp.com" - name = "g" - value = "204.110.191.5" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_truck" { - zone_name = "w5isp.com" - name = "truck" - value = "g.w5isp.com." - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_sendgrid1" { - zone_name = "w5isp.com" - name = "em40" - value = "u177982.wl233.sendgrid.net" - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_sendgrid2" { - zone_name = "w5isp.com" - name = "s1._domainkey" - value = "s1.domainkey.u177982.wl233.sendgrid.net." - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_sendgrid3" { - zone_name = "w5isp.com" - name = "s2._domainkey" - value = "s2.domainkey.u177982.wl233.sendgrid.net." - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_dmarc" { - zone_name = "w5isp.com" - name = "_dmarc" - value = "v=DMARC1; p=quarantine; rua=mailto:postmaster@w5isp.com; ruf=mailto:postmaster@w5isp.com; fo=1" - type = "TXT" - ttl = 3600 -} - -# Mail server -resource "dnsimple_zone_record" "w5isp_mail" { - zone_name = "w5isp.com" - name = "mail" - value = "204.110.191.5" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_sync" { - zone_name = "w5isp.com" - name = "sync" - value = "204.110.191.216" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_log" { - zone_name = "w5isp.com" - name = "log" - value = "g.w5isp.com" - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_autodiscover" { - zone_name = "w5isp.com" - name = "autodiscover" - value = "mail.w5isp.com" - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_autodiscover_srv" { - zone_name = "w5isp.com" - name = "_autodiscover._tcp" - value = "0 443 mail.w5isp.com" - type = "SRV" - priority = 0 - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_autoconfig" { - zone_name = "w5isp.com" - name = "autoconfig" - value = "mail.w5isp.com" - type = "CNAME" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_n8n" { - zone_name = "w5isp.com" - name = "n8n" - value = "204.110.191.2" # Traefik ingress on k3s cluster - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_nodered" { - zone_name = "w5isp.com" - name = "nodered" - value = "204.110.191.2" # Node-RED via Traefik on k3s cluster - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_headscale" { - zone_name = "w5isp.com" - name = "headscale" - value = "66.206.18.166" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_hs" { - zone_name = "w5isp.com" - name = "hs" - value = "66.206.18.166" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_dokku" { - zone_name = "w5isp.com" - name = "dokku" - value = "204.110.191.218" - type = "A" - ttl = 3600 -} - -resource "dnsimple_zone_record" "w5isp_camper" { - zone_name = "w5isp.com" - name = "camper" - value = "skippy.w5isp.com." - type = "CNAME" - ttl = 3600 -} diff --git a/terraform/w5isp.tfplan b/terraform/w5isp.tfplan deleted file mode 100644 index a09680d..0000000 Binary files a/terraform/w5isp.tfplan and /dev/null differ