From f534fb71b249085376c904165613b080f57a9491 Mon Sep 17 00:00:00 2001
From: Adrian Kappel <adrian@mailchimp.com>
Date: Fri, 20 Oct 2023 11:06:36 -0400
Subject: [PATCH 1/3] Create mailchimp.com.email-signing.json

---
 mailchimp.com.email-signing.json | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 mailchimp.com.email-signing.json

diff --git a/mailchimp.com.email-signing.json b/mailchimp.com.email-signing.json
new file mode 100644
index 00000000..9f39b292
--- /dev/null
+++ b/mailchimp.com.email-signing.json
@@ -0,0 +1,34 @@
+{
+    "providerId": "mailchimp.com",
+    "providerName": "Intuit Mailchimp",
+    "serviceId": "email-signing",
+    "serviceName": "Intuit Mailchimp Email Signing",
+    "version": "1",
+    "logoUrl": "https://cdn-images.mailchimp.com/product/brand_assets/logos/mc-freddie-dark.svg",
+    "syncPubKeyDomain": "mailchimp.com",
+    "description": "Configures DNS records for Mailchimp email signing",
+    "variableDescription": "sel1/sel2 are selector values; host1/host2 are the hosts we want the CNAMEs to point to. data is what the DMARC TXT is set to.",
+    "records": [
+        {
+            "groupId": "dkim",
+            "type": "CNAME",
+            "host": "%sel1%._domainkey",
+            "pointsTo": "%host1%",
+            "ttl": 3600
+        },
+        {
+            "groupId": "dkim",
+            "type": "CNAME",
+            "host": "%sel2%._domainkey",
+            "pointsTo": "%host2%",
+            "ttl": 3600
+        },
+        {
+            "groupId": "dmarc",
+            "type": "TXT",
+            "host": "_dmarc",
+            "data": "%data%",
+            "ttl": 3600
+        }
+    ]
+}

From 00de95ab19f061394007360067117f2af34a3eb5 Mon Sep 17 00:00:00 2001
From: Adrian Kappel <adrian@mailchimp.com>
Date: Fri, 20 Oct 2023 11:47:42 -0400
Subject: [PATCH 2/3] moves version to integer, instead of string

---
 mailchimp.com.email-signing.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailchimp.com.email-signing.json b/mailchimp.com.email-signing.json
index 9f39b292..e6e23090 100644
--- a/mailchimp.com.email-signing.json
+++ b/mailchimp.com.email-signing.json
@@ -3,7 +3,7 @@
     "providerName": "Intuit Mailchimp",
     "serviceId": "email-signing",
     "serviceName": "Intuit Mailchimp Email Signing",
-    "version": "1",
+    "version": 1,
     "logoUrl": "https://cdn-images.mailchimp.com/product/brand_assets/logos/mc-freddie-dark.svg",
     "syncPubKeyDomain": "mailchimp.com",
     "description": "Configures DNS records for Mailchimp email signing",

From 26b56c38bc00e4036c7e286567b8c01dbf46b103 Mon Sep 17 00:00:00 2001
From: Adrian Kappel <adrian@mailchimp.com>
Date: Tue, 24 Oct 2023 15:39:35 -0400
Subject: [PATCH 3/3] Adds txtConflictMatchingMode for dmarc

---
 mailchimp.com.email-signing.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mailchimp.com.email-signing.json b/mailchimp.com.email-signing.json
index e6e23090..550771ee 100644
--- a/mailchimp.com.email-signing.json
+++ b/mailchimp.com.email-signing.json
@@ -28,7 +28,8 @@
             "type": "TXT",
             "host": "_dmarc",
             "data": "%data%",
-            "ttl": 3600
+            "ttl": 3600,
+            "txtConflictMatchingMode": "All"
         }
     ]
 }