nftables: remove redundant check-broadcast

[sourcephile-nix.git] / hosts / mermet / knot / sourcephile.fr.nix

diff --git a/hosts/mermet/knot/sourcephile.fr.nix b/hosts/mermet/knot/sourcephile.fr.nix
index de1eb4511306500ec405acb34e5383f1343a5b8a..c816ea41c0ec9945680c218bb9c9afe7a1a1badd 100644 (file)
--- a/hosts/mermet/knot/sourcephile.fr.nix
+++ b/hosts/mermet/knot/sourcephile.fr.nix
@@ -16,14 +16,14 @@ services.knot.zones."${domain}" = {
         action: update
         update-owner: name
         update-owner-match: equal
-        update-owner-name: [_acme-challenge, _acme-challenge.hut]
+        update-owner-name: [_acme-challenge, _acme-challenge.hut, _acme-challenge.code]
         update-type: [TXT]
       - id: acl_tsig_acme_${domainID}
         key: acme_${domainID}
         action: update
         update-owner: name
         update-owner-match: equal
-        update-owner-name: [_acme-challenge, _acme-challenge.hut]
+        update-owner-name: [_acme-challenge]
         update-type: [TXT]
       - id: acl_tsig_bureau1_${domainID}
         key: bureau1_${domainID}
@@ -58,7 +58,7 @@ services.knot.zones."${domain}" = {
           )
           $TTL 86400
           @ NS ns
-          ns A ${hosts.mermet.extraArgs.ipv4}
+          ns A ${hosts.mermet._module.args.ipv4}
         ''}"
   '';
   # TODO: increase the TTL once things have settled down
@@ -79,43 +79,43 @@ services.knot.zones."${domain}" = {
     @ NS ns
     @ NS ns6.gandi.net.
     whoami4 NS ns.whoami4
-    ns.whoami4 A ${hosts.mermet.extraArgs.ipv4}
+    ns.whoami4 A ${hosts.mermet._module.args.ipv4}
 
     ; A (DNS -> IPv4)
-    @            A ${hosts.mermet.extraArgs.ipv4}
-    mermet       A ${hosts.mermet.extraArgs.ipv4}
-    autoconfig   A ${hosts.mermet.extraArgs.ipv4}
-    doc          A ${hosts.mermet.extraArgs.ipv4}
-    code         A ${hosts.mermet.extraArgs.ipv4}
-    git          A ${hosts.mermet.extraArgs.ipv4}
-    imap         A ${hosts.mermet.extraArgs.ipv4}
-    mail         A ${hosts.mermet.extraArgs.ipv4}
-    mails        A ${hosts.mermet.extraArgs.ipv4}
-    news         A ${hosts.mermet.extraArgs.ipv4}
-    public-inbox A ${hosts.mermet.extraArgs.ipv4}
-    ns           A ${hosts.mermet.extraArgs.ipv4}
-    pop          A ${hosts.mermet.extraArgs.ipv4}
-    smtp         A ${hosts.mermet.extraArgs.ipv4}
-    submission   A ${hosts.mermet.extraArgs.ipv4}
-    www          A ${hosts.mermet.extraArgs.ipv4}
-    lemoutona5pattes A ${hosts.mermet.extraArgs.ipv4}
-    covid19      A ${hosts.mermet.extraArgs.ipv4}
-    croc         A ${hosts.mermet.extraArgs.ipv4}
-    stun         A ${hosts.mermet.extraArgs.ipv4}
-    turn         A ${hosts.mermet.extraArgs.ipv4}
-    whoami       A ${hosts.mermet.extraArgs.ipv4}
-    hut          A ${hosts.mermet.extraArgs.ipv4}
-    builds.hut   A ${hosts.mermet.extraArgs.ipv4}
-    dispatch.hut A ${hosts.mermet.extraArgs.ipv4}
-    git.hut      A ${hosts.mermet.extraArgs.ipv4}
-    hg.hut       A ${hosts.mermet.extraArgs.ipv4}
-    hub.hut      A ${hosts.mermet.extraArgs.ipv4}
-    lists.hut    A ${hosts.mermet.extraArgs.ipv4}
-    meta.hut     A ${hosts.mermet.extraArgs.ipv4}
-    man.hut      A ${hosts.mermet.extraArgs.ipv4}
-    pages.hut    A ${hosts.mermet.extraArgs.ipv4}
-    paste.hut    A ${hosts.mermet.extraArgs.ipv4}
-    todo.hut     A ${hosts.mermet.extraArgs.ipv4}
+    @            A ${hosts.mermet._module.args.ipv4}
+    mermet       A ${hosts.mermet._module.args.ipv4}
+    autoconfig   A ${hosts.mermet._module.args.ipv4}
+    doc          A ${hosts.mermet._module.args.ipv4}
+    git          A ${hosts.mermet._module.args.ipv4}
+    imap         A ${hosts.mermet._module.args.ipv4}
+    mail         A ${hosts.mermet._module.args.ipv4}
+    mails        A ${hosts.mermet._module.args.ipv4}
+    news         A ${hosts.mermet._module.args.ipv4}
+    public-inbox A ${hosts.mermet._module.args.ipv4}
+    ns           A ${hosts.mermet._module.args.ipv4}
+    pop          A ${hosts.mermet._module.args.ipv4}
+    smtp         A ${hosts.mermet._module.args.ipv4}
+    submission   A ${hosts.mermet._module.args.ipv4}
+    www          A ${hosts.mermet._module.args.ipv4}
+    lemoutona5pattes A ${hosts.mermet._module.args.ipv4}
+    covid19      A ${hosts.mermet._module.args.ipv4}
+    croc         A ${hosts.mermet._module.args.ipv4}
+    stun         A ${hosts.mermet._module.args.ipv4}
+    turn         A ${hosts.mermet._module.args.ipv4}
+    whoami       A ${hosts.mermet._module.args.ipv4}
+    code          A ${hosts.mermet._module.args.ipv4}
+    builds.code   A ${hosts.mermet._module.args.ipv4}
+    dispatch.code A ${hosts.mermet._module.args.ipv4}
+    git.code      A ${hosts.mermet._module.args.ipv4}
+    hg.code       A ${hosts.mermet._module.args.ipv4}
+    hub.code      A ${hosts.mermet._module.args.ipv4}
+    lists.code    A ${hosts.mermet._module.args.ipv4}
+    meta.code     A ${hosts.mermet._module.args.ipv4}
+    man.code      A ${hosts.mermet._module.args.ipv4}
+    pages.code    A ${hosts.mermet._module.args.ipv4}
+    paste.code    A ${hosts.mermet._module.args.ipv4}
+    todo.code     A ${hosts.mermet._module.args.ipv4}
+    miniflux      A ${hosts.mermet._module.args.ipv4}
 
     ; CNAME (Canonical Name)
     losurdo          CNAME bureau1
@@ -132,17 +132,30 @@ services.knot.zones."${domain}" = {
     nix-serve        CNAME losurdo
     nix-extracache   CNAME losurdo
     nix-localcache   CNAME lan.losurdo
+    hut              CNAME code
+    builds.hut       CNAME builds.code
+    dispatch.hut     CNAME dispatch.code
+    git.hut          CNAME git.code
+    hg.hut           CNAME hg.code
+    hub.hut          CNAME hub.code
+    lists.hut        CNAME lists.code
+    meta.hut         CNAME meta.code
+    man.hut          CNAME man.code
+    pages.hut        CNAME pages.code
+    paste.hut        CNAME paste.code
+    todo.hut         CNAME todo.code
+    sftp             CNAME losurdo
 
     ; DMARC (Domain-based Message Authentication, Reporting and Conformance)
     _dmarc 3600 IN TXT "v=DMARC1; p=none; pct=100; rua=mailto:root+dmarc+aggregate@sourcephile.fr; ruf=mailto:root+dmarc+forensic@sourcephile.fr"
 
     ; SPF (Sender Policy Framework)
-    @ 3600 IN TXT "v=spf1 mx ip4:${hosts.mermet.extraArgs.ipv4} -all"
+    @ 3600 IN TXT "v=spf1 mx ip4:${hosts.mermet._module.args.ipv4} -all"
 
     ; MX (Mail eXchange)
     @ 1800 MX 5 mail
-    lists.hut 1800 MX 5 mail
-    todo.hut  1800 MX 5 mail
+    lists.code 1800 MX 5 mail
+    todo.code  1800 MX 5 mail
 
     ; SRV (SeRVice)
     _git._tcp.git             18000 IN SRV 0 0 9418 git