From 78bfaede9a28adc2c5af8012475aaee3f3d8cf96 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 22 Nov 2025 21:36:17 +0000
Subject: [PATCH] Fix SPF record types

---
 terraform/jakehoward.tech.tf  | 22 +++++++++++-----------
 terraform/theorangeone.net.tf | 34 +++++++++++++---------------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf
index e5cae5b..e45f1ff 100644
--- a/terraform/jakehoward.tech.tf
+++ b/terraform/jakehoward.tech.tf
@@ -13,16 +13,6 @@ resource "gandi_livedns_record" "jakehowardtech_mx" {
   ]
 }
 
-resource "gandi_livedns_record" "jakehowardtech_spf" {
-  zone = data.gandi_livedns_domain.jakehowardtech.id
-  name = "@"
-  type = "SPF"
-  ttl  = 3600
-  values = [
-    "\"v=spf1 include:spf.messagingengine.com -all\""
-  ]
-}
-
 resource "gandi_livedns_record" "jakehowardtech_dkim_fm1" {
   zone = data.gandi_livedns_domain.jakehowardtech.id
   name = "fm1._domainkey"
@@ -63,6 +53,16 @@ resource "gandi_livedns_record" "jakehowardtech_dmarc" {
   ]
 }
 
+resource "gandi_livedns_record" "jakehowardtech_txt" {
+  zone = data.gandi_livedns_domain.jakehowardtech.id
+  name = "@"
+  type = "TXT"
+  ttl  = 3600
+  values = [
+    "\"v=spf1 include:spf.messagingengine.com -all\""
+  ]
+}
+
 resource "gandi_livedns_record" "jakehowardtech_speed" {
   zone = data.gandi_livedns_domain.jakehowardtech.id
   name = "speed"
@@ -156,7 +156,7 @@ resource "gandi_livedns_record" "jakehowardtech_recipes" {
 resource "gandi_livedns_record" "jakehowardtech_mailgun_spf" {
   zone = data.gandi_livedns_domain.jakehowardtech.id
   name = "mg"
-  type = "SPF"
+  type = "TXT"
   ttl  = 3600
   values = [
     "\"v=spf1 include:mailgun.org -all\""
diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf
index 72c72bd..d8ca7ee 100644
--- a/terraform/theorangeone.net.tf
+++ b/terraform/theorangeone.net.tf
@@ -53,16 +53,6 @@ resource "gandi_livedns_record" "theorangeonenet_mx" {
   ]
 }
 
-resource "gandi_livedns_record" "theorangeonenet_spf" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "@"
-  type = "SPF"
-  ttl  = 3600
-  values = [
-    "\"v=spf1 include:spf.messagingengine.com -all\""
-  ]
-}
-
 resource "gandi_livedns_record" "theorangeonenet_dkim_fm1" {
   zone = data.gandi_livedns_domain.theorangeonenet.id
   name = "fm1._domainkey"
@@ -120,6 +110,18 @@ resource "gandi_livedns_record" "theorangeonenet_dmarc_report" {
   ]
 }
 
+resource "gandi_livedns_record" "theorangeonenet_txt" {
+  zone = data.gandi_livedns_domain.theorangeonenet.id
+  name = "@"
+  type = "TXT"
+  ttl  = 3600
+  values = [
+    "\"google-site-verification=IXY4iSBN_vOcM3cp_f-BgVvEI_shz1GzXuY_8dqY61o\"",
+    "\"v=spf1 include:spf.messagingengine.com -all\""
+  ]
+}
+
+
 resource "gandi_livedns_record" "theorangeonenet_apex" {
   zone = data.gandi_livedns_domain.theorangeonenet.id
   name = "@"
@@ -190,20 +192,10 @@ resource "gandi_livedns_record" "theorangeonenet_bin" {
   ]
 }
 
-resource "gandi_livedns_record" "theorangeonenet_google_site_verification" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "@"
-  type = "TXT"
-  ttl  = 3600
-  values = [
-    "\"google-site-verification=IXY4iSBN_vOcM3cp_f-BgVvEI_shz1GzXuY_8dqY61o\""
-  ]
-}
-
 resource "gandi_livedns_record" "theorangeonenet_mailgun_spf" {
   zone = data.gandi_livedns_domain.theorangeonenet.id
   name = "mg"
-  type = "SPF"
+  type = "TXT"
   ttl  = 3600
   values = [
     "\"v=spf1 include:mailgun.org -all\""