From 2071a0f7a2261eb49512f9d938836811c3b914a9 Mon Sep 17 00:00:00 2001
From: hcornet <hcornet@tips-of-mine.fr>
Date: Mon, 13 Jan 2025 21:48:50 +0100
Subject: [PATCH] presque

---
 records_a.tf     |  6 +++---
 records_cname.tf |  6 ++----
 records_mx.tf    | 15 +++++----------
 records_srv.tf   | 30 ++++++++++++++----------------
 records_txt.tf   |  9 +++------
 5 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/records_a.tf b/records_a.tf
index f6dae66..2bd39db 100644
--- a/records_a.tf
+++ b/records_a.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_record" "terraform" {
-  domain  = var.cloudflare_zone
+  zone_id  = "${var.cloudflare_zone}"
   name    = "terraform"
   value   = "82.66.77.254"
   type    = "A"
@@ -8,9 +8,9 @@ resource "cloudflare_record" "terraform" {
 }
 
 resource "cloudflare_record" "a-root" {
-  domain = "${var.cloudflare_zone}"
+  zone_id = "${var.cloudflare_zone}"
   name    = "@"
-  value   = "${var.main_server}"
+  value   = var.main_server
   type    = "A"
   ttl     = 3600
   proxied = false
diff --git a/records_cname.tf b/records_cname.tf
index b20ed28..8954fb9 100644
--- a/records_cname.tf
+++ b/records_cname.tf
@@ -1,6 +1,5 @@
 resource "cloudflare_record" "cname-www" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name    = "www"
   value   = "${cloudflare_record.a-root.hostname}"
   type    = "CNAME"
@@ -9,8 +8,7 @@ resource "cloudflare_record" "cname-www" {
 }
 
 resource "cloudflare_record" "cname-mail" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name    = "mail"
   value   = "ghs.googlehosted.com"
   type    = "CNAME"
diff --git a/records_mx.tf b/records_mx.tf
index bf10523..42f5426 100644
--- a/records_mx.tf
+++ b/records_mx.tf
@@ -1,6 +1,5 @@
 resource "cloudflare_record" "mx-aspmx" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name     = "@"
   value    = "aspmx.l.google.com"
   type     = "MX"
@@ -8,8 +7,7 @@ resource "cloudflare_record" "mx-aspmx" {
 }
 
 resource "cloudflare_record" "mx-alt1" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name     = "@"
   value    = "alt1.aspmx.l.google.com"
   type     = "MX"
@@ -17,8 +15,7 @@ resource "cloudflare_record" "mx-alt1" {
 }
 
 resource "cloudflare_record" "mx-alt2" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name     = "@"
   value    = "alt2.aspmx.l.google.com"
   type     = "MX"
@@ -26,8 +23,7 @@ resource "cloudflare_record" "mx-alt2" {
 }
 
 resource "cloudflare_record" "mx-alt3" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name     = "@"
   value    = "alt3.aspmx.l.google.com"
   type     = "MX"
@@ -35,8 +31,7 @@ resource "cloudflare_record" "mx-alt3" {
 }
 
 resource "cloudflare_record" "mx-alt4" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id = "${var.cloudflare_zone}"
   name     = "@"
   value    = "alt4.aspmx.l.google.com"
   type     = "MX"
diff --git a/records_srv.tf b/records_srv.tf
index 73cc38b..79bd5d8 100644
--- a/records_srv.tf
+++ b/records_srv.tf
@@ -1,16 +1,14 @@
-resource "cloudflare_record" "sip-tls-terraform-srv" {
-  domain = "${var.cloudflare_zone}"
-
-  name   = "_sip._tls"
-  type   = "SRV"
-
-  data = {
-    service  = "_sip"
-    proto    = "_tls"
-    name     = "terraform-srv"
-    priority = 0
-    weight   = 0
-    port     = 443
-    target   = "tips-of-mine.com"
-  }
-}
\ No newline at end of file
+#resource "cloudflare_record" "sip-tls-terraform-srv" {
+#  zone_id  = "$var.cloudflare_zone}"
+#  name   = "_sip._tls"
+#  type   = "SRV"
+#  data = {
+#    service  = "_sip"
+#    proto    = "_tls"
+#    name     = "terraform-srv"
+#    priority = 0
+#    weight   = 0
+#    port     = 443
+#    target   = "tips-of-mine.com"
+#  }
+#}
\ No newline at end of file
diff --git a/records_txt.tf b/records_txt.tf
index 4088d65..5b4d0eb 100644
--- a/records_txt.tf
+++ b/records_txt.tf
@@ -1,6 +1,5 @@
 resource "cloudflare_record" "txt-amazonses" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id  = "$var.cloudflare_zone}"
   name  = "_amazonses"
   value = "xxxxxxxx"
   type  = "TXT"
@@ -8,8 +7,7 @@ resource "cloudflare_record" "txt-amazonses" {
 }
 
 resource "cloudflare_record" "txt-dmarc" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id  = "$var.cloudflare_zone}"
   name  = "_dmarc"
   value = "v=DMARC1; p=none; pct=100; rua=mailto:dmarc@tips-of-mine.com; sp=none; aspf=r;"
   type  = "TXT"
@@ -17,8 +15,7 @@ resource "cloudflare_record" "txt-dmarc" {
 }
 
 resource "cloudflare_record" "txt-mandrill-domainkey" {
-  domain = "${var.cloudflare_zone}"
-
+  zone_id  = "$var.cloudflare_zone}"
   name  = "mandrill._domainkey"
   value = "v=DKIM1; k=rsa; p=xxxxxxxx;"
   type  = "TXT"