Checkpoint: Working vps.tf declaration after Vultr migration

3 files changed, 14 insertions, 12 deletions

diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate
index 0cc4a7d..f2ff470 100644
--- a/secrets/terraform/terraform.tfstate
+++ b/secrets/terraform/terraform.tfstate
diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup
index 6a6beca..49e192f 100644
--- a/secrets/terraform/terraform.tfstate.backup
+++ b/secrets/terraform/terraform.tfstate.backup
diff --git a/vps.tf b/vps.tf
index af85a48..3f56681 100644
--- a/vps.tf
+++ b/vps.tf
@@ -76,7 +76,7 @@ resource "vultr_dns_domain" "vps_tld" {
 }
 
 resource "vultr_dns_record" "vps_mail_a_record" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = "mail"
   data   = vultr_instance.vps_server.main_ip
   type   = "A"
@@ -89,7 +89,7 @@ resource "vultr_reverse_ipv4" "vps_mail_reverse_ipv4" {
 }
 
 resource "vultr_dns_record" "vps_mail_aaaa_record" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = "mail"
   data   = vultr_instance.vps_server.v6_main_ip
   type   = "AAAA"
@@ -102,36 +102,38 @@ resource "vultr_reverse_ipv6" "vps_mail_reverse_ipv6" {
 }
 
 resource "vultr_dns_record" "vps_mx_record" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = ""
   data   = local.mail_domain
   type   = "MX"
 }
 
 resource "vultr_dns_record" "vps_spf_txt" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = ""
   data   = "\"v=spf1 mx -all\""
   type   = "TXT"
 }
 
 resource "vultr_dns_record" "vps_dkim_txt" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = "${var.dkim_selector}._domainkey"
   data   = "\"v=DKIM1;k=rsa;p=${var.dkim_public_key}\""
   type   = "TXT"
 }
 
 resource "vultr_dns_record" "vps_dmarc_txt" {
-  domain = var.tld
+  domain = vultr_dns_domain.vps_tld.id
   name   = "_dmarc"
   data   = "\"v=DMARC1;p=none;pct=100;rua=mailto:postmaster@${var.tld};\""
   type   = "TXT"
 }
 
-resource "vultr_dns_record" "vps_cname_start_alias" {
-  domain = var.tld
-  name   = "*"
-  data   = var.tld
-  type   = "CNAME"
-}
+# I think this DNS is configured by default
+
+# resource "vultr_dns_record" "vps_cname_start_alias" {
+#   domain = vultr_dns_domain.vps_tld.id
+#   name   = "*"
+#   data   = var.tld
+#   type   = "CNAME"
+# }