diff --git a/terraform/iac/alexpires.me.tf b/terraform/iac/alexpires.me.tf index 83cf3a5..f2c6c3a 100644 --- a/terraform/iac/alexpires.me.tf +++ b/terraform/iac/alexpires.me.tf @@ -1,4 +1,4 @@ -resource "cloudns_dns_record" "microk8s" { +resource "cloudns_dns_record" "alexpires_me_microk8s" { name = data.contabo_instance.microk8s.name zone = local.alexpires_me_zone type = "A" @@ -6,55 +6,55 @@ resource "cloudns_dns_record" "microk8s" { ttl = "3600" } -resource "cloudns_dns_record" "code" { +resource "cloudns_dns_record" "alexpires_me_code" { name = "code" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "cloud" { +resource "cloudns_dns_record" "alexpires_me_cloud" { name = "cloud" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "tv" { +resource "cloudns_dns_record" "alexpires_me_tv" { name = "tv" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "blog" { +resource "cloudns_dns_record" "alexpires_me_blog" { name = "blog" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "www" { +resource "cloudns_dns_record" "alexpires_me_www" { name = "www" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "prod_01" { +resource "cloudns_dns_record" "alexpires_me_prod_01" { name = "prod-01" zone = local.alexpires_me_zone type = "CNAME" - value = "${cloudns_dns_record.microk8s.name}.${local.alexpires_me_zone}" + value = "${cloudns_dns_record.alexpires_me_microk8s.name}.${local.alexpires_me_zone}" ttl = "3600" } -resource "cloudns_dns_record" "root" { +resource "cloudns_dns_record" "alexpires_me_root" { name = "" zone = local.alexpires_me_zone type = "A" @@ -62,23 +62,23 @@ resource "cloudns_dns_record" "root" { ttl = "3600" } -resource "cloudns_dns_record" "spf" { +resource "cloudns_dns_record" "alexpires_me_spf" { name = "" zone = local.alexpires_me_zone type = "TXT" - value = "v=spf1 include:_spf.tem.scaleway.com -all" + value = "v=spf1 include:_spf.tem.scaleway.com include:spf.webapps.net ~all" ttl = "3600" } -resource "cloudns_dns_record" "dkim" { +resource "cloudns_dns_record" "alexpires_me_dkim" { name = "${var.scaleway_dkim_key}._domainkey" zone = local.alexpires_me_zone type = "TXT" - value = "vv=DKIM1; h=sha256; k=rsa; p=${var.scaleway_dkim_value}" + value = "v=DKIM1; h=sha256; k=rsa; p=${var.scaleway_dkim_value}" ttl = "3600" } -resource "cloudns_dns_record" "dmarc" { +resource "cloudns_dns_record" "alexpires_me_dmarc" { name = "_dmarc" zone = local.alexpires_me_zone type = "TXT" @@ -86,38 +86,64 @@ resource "cloudns_dns_record" "dmarc" { ttl = "3600" } -import { - id = "${local.alexpires_me_zone}/178650182" - to = cloudns_dns_record.code +resource "cloudns_dns_record" "alexpires_me_mx" { + name = "" + zone = local.alexpires_me_zone + type = "MX" + priority = "10" + value = "mail-pt.securemail.pro" + ttl = "3600" } -import { - id = "${local.alexpires_me_zone}/281519967" - to = cloudns_dns_record.cloud +resource "cloudns_dns_record" "alexpires_me_mail" { + name = "mail" + zone = local.alexpires_me_zone + type = "CNAME" + value = "mail-pt.securemail.pro" + ttl = "3600" } -import { - id = "${local.alexpires_me_zone}/521232645" - to = cloudns_dns_record.tv +moved { + from = cloudns_dns_record.microk8s + to = cloudns_dns_record.alexpires_me_microk8s } - -import { - id = "${local.alexpires_me_zone}/178650153" - to = cloudns_dns_record.blog +moved { + from = cloudns_dns_record.code + to = cloudns_dns_record.alexpires_me_code } - -import { - id = "${local.alexpires_me_zone}/281520528" - to = cloudns_dns_record.spf +moved { + from = cloudns_dns_record.cloud + to = cloudns_dns_record.alexpires_me_cloud } - -import { - id = "${local.alexpires_me_zone}/281520539" - to = cloudns_dns_record.dkim +moved { + from = cloudns_dns_record.tv + to = cloudns_dns_record.alexpires_me_tv } - -import { - id = "${local.alexpires_me_zone}/281718535" - to = cloudns_dns_record.dmarc +moved { + from = cloudns_dns_record.blog + to = cloudns_dns_record.alexpires_me_blog +} +moved { + from = cloudns_dns_record.www + to = cloudns_dns_record.alexpires_me_www +} +moved { + from = cloudns_dns_record.prod_01 + to = cloudns_dns_record.alexpires_me_prod_01 +} +moved { + from = cloudns_dns_record.root + to = cloudns_dns_record.alexpires_me_root +} +moved { + from = cloudns_dns_record.spf + to = cloudns_dns_record.alexpires_me_spf +} +moved { + from = cloudns_dns_record.dkim + to = cloudns_dns_record.alexpires_me_dkim +} +moved { + from = cloudns_dns_record.dmarc + to = cloudns_dns_record.alexpires_me_dmarc } -