From 9a2da567b1d482903a72ea22bfe8379e80698ded Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 29 May 2021 17:08:37 +0200
Subject: knot@surtr: syntax

---
 hosts/surtr/dns/default.nix | 57 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

(limited to 'hosts/surtr/dns')

diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix
index 31c02196..ca6a2aed 100644
--- a/hosts/surtr/dns/default.nix
+++ b/hosts/surtr/dns/default.nix
@@ -27,23 +27,24 @@
           listen: 2a03:4000:52:ada::@53
 
         remote:
-          - id: "inwx_notify"
+          - id: inwx_notify
             address: 185.181.104.96@53
 
         acl:
-          - id: "inwx_acl"
+          - id: inwx_acl
             address: 185.181.104.96
             action: transfer
 
         template:
-          - id: "inwx_zone"
+          - id: inwx_zone
             storage: /var/lib/knot
             zonefile-sync: -1
             zonefile-load: difference-no-serial
+            journal-content: all
             semantic-checks: on
             dnssec-signing: on
-            notify: ["inwx_notify"]
-            acl: ["inwx_acl"]
+            notify: [inwx_notify]
+            acl: [inwx_acl]
 
         policy:
           - id: rsa
@@ -53,36 +54,36 @@
             zsk-lifetime: 30d
 
         zone:
-          - template: "inwx_zone"
-            domain: yggdrasil.li
+          - domain: yggdrasil.li
+            template: inwx_zone
             file: ${./zones/li.yggdrasil.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: nights.email
+
+          - domain: nights.email
+            template: inwx_zone
             file: ${./zones/email.nights.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: 141.li
+
+          - domain: 141.li
+            template: inwx_zone
             file: ${./zones/li.141.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: kleen.li
+
+          - domain: kleen.li
+            template: inwx_zone
             file: ${./zones/li.kleen.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: xmpp.li
+
+          - domain: xmpp.li
+            template: inwx_zone
             file: ${./zones/li.xmpp.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: dirty-haskell.org
+
+          - domain: dirty-haskell.org
+            template: inwx_zone
             file: ${./zones/org.dirty-haskell.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: praseodym.org
+
+          - domain: praseodym.org
+            template: inwx_zone
             file: ${./zones/org.praseodym.soa}
-        zone:
-          - template: "inwx_zone"
-            domain: rheperire.org
+
+          - domain: rheperire.org
+            template: inwx_zone
             file: ${./zones/org.rheperire.soa}
       '';
     };
-- 
cgit v1.2.3