From 2b4d5207430df57df7ea777c8bca0847329dd32a Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Thu, 11 Jan 2024 21:52:20 +0100
Subject: [PATCH] More sensible config

---
 config.yaml         | 10 +---------
 config/moll.re.yaml | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/config.yaml b/config.yaml
index 89f7faa..1e158c8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -12,15 +12,7 @@ providers:
 
   cloudflare:
     class: octodns_cloudflare.CloudflareProvider
-    # Your Cloudflare account email address (required, optional if using token)
-    # email: env/CLOUDFLARE_EMAIL
-    # The API Token or API Key.
-    # Required permissions for API Tokens are Zone:Read, DNS:Read and DNS:Key.
     token: env/CLOUDFLARE_TOKEN
-    # Optional. Filter by account ID in environments where a token has access
-    # across more than the permitted number of accounts allowed by Cloudflare.
-    # account_id: env/CLOUDFLARE_ACCOUNT_ID
-
 
 
 zones:
@@ -29,4 +21,4 @@ zones:
       - config # sets all other records
       - kluster # sets kluster.moll.re
     targets:
-      - cloudflare
\ No newline at end of file
+      - cloudflare
diff --git a/config/moll.re.yaml b/config/moll.re.yaml
index be20f4e..ed34490 100644
--- a/config/moll.re.yaml
+++ b/config/moll.re.yaml
@@ -1,11 +1,18 @@
 '':
-  octodns:
-    lenient: true
-    # CNAMES are not allowed at the root of a zone, but cloudflare allows it
-  ttl: 60
-  type: CNAME
-  value: homepage.kluster.moll.re.
-
+  - octodns:
+      lenient: true
+      # CNAMES are not allowed at the root of a zone, but cloudflare allows it
+    ttl: 60
+    type: CNAME
+    value: homepage.kluster.moll.re.
+  - exchange: inbound-smtp.skiff.com.
+    preference: 0
+    ttl: 300
+    type: MX
+  - ttl: 300
+    type: TXT
+    values:
+      - v=spf1 include:tlfind3ul99o2wi.spf.skiff.com -all
 
 '*.kluster':
   ttl: 60
@@ -14,6 +21,7 @@
 
 
 '_dmarc':
+  ttl: 300
   type: TXT
   values:
     - v=DMARC1\; p=reject\; pct=100\; adkim=s\; aspf=s
@@ -26,16 +34,6 @@
   type: SRV
   weight: 500
 
-
-'moll.re':
-  - exchange: inbound-smtp.skiff.com.
-    preference: 0
-    type: MX
-
-  - type: TXT
-    values:
-      - v=spf1 include:tlfind3ul99o2wi.spf.skiff.com -all
-
 'short':
   ttl: 60
   type: CNAME
@@ -43,10 +41,12 @@
 
 
 'skiff1._domainkey':
+  ttl: 300
   type: CNAME
   value: skiff1.tlfind3ul99o2wi.dkim.skiff.com.
 
 
 'skiff2._domainkey':
+  ttl: 300
   type: CNAME
   value: skiff2.tlfind3ul99o2wi.dkim.skiff.com.