nix: update inputs

[sourcephile-nix.git] / hosts / mermet / knot / autogeree.net.nix

diff --git a/hosts/mermet/knot/autogeree.net.nix b/hosts/mermet/knot/autogeree.net.nix
index 08da9c783408f88b4bc506ef975a68552099fb47..bdaecd1ac3d3af74a578c1da303fc8ce867eb770 100644 (file)
--- a/hosts/mermet/knot/autogeree.net.nix
+++ b/hosts/mermet/knot/autogeree.net.nix
@@ -33,9 +33,9 @@ services.knot.zones."${domain}" = {
         serial-policy: increment
         semantic-checks: on
         notify: secondary_gandi
-        notify: secondary_muarf
+        #notify: secondary_muarf
         acl: acl_gandi
-        acl: acl_muarf
+        #acl: acl_muarf
         acl: acl_localhost_acme_${domainID}
         acl: acl_tsig_acme_${domainID}
         dnssec-signing: off
@@ -58,27 +58,27 @@ services.knot.zones."${domain}" = {
     ; NS (Name Server)
     @ NS ns
     @ NS ns6.gandi.net.
-    @ NS ns0.muarf.org.
+    ;@ NS ns0.muarf.org.
 
     ; A (DNS -> IPv4)
-    @          A ${hosts.mermet.extraArgs.ipv4}
-    mermet     A ${hosts.mermet.extraArgs.ipv4}
-    autoconfig 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}
-    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}
+    @          A ${hosts.mermet._module.args.ipv4}
+    mermet     A ${hosts.mermet._module.args.ipv4}
+    autoconfig A ${hosts.mermet._module.args.ipv4}
+    code       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}
+    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}
     chomsky    A 91.216.110.36
     alpes      A 195.88.84.51
 
     ; SPF (Sender Policy Framework)
-    @ 3600 IN SPF "v=spf1 mx ip4:${hosts.mermet.extraArgs.ipv4} -all"
-    @ 3600 IN TXT "v=spf1 mx ip4:${hosts.mermet.extraArgs.ipv4} -all"
+    @ 3600 IN SPF "v=spf1 mx ip4:${hosts.mermet._module.args.ipv4} -all"
+    @ 3600 IN TXT "v=spf1 mx ip4:${hosts.mermet._module.args.ipv4} -all"
 
     ; MX (Mail eXchange)
     @ 180 MX 5 mail
@@ -104,10 +104,12 @@ systemd.services.knot = {
   wants = [ gnupg.secrets."knot/tsig/${domain}/acme.conf".service ];
 };
 /* Useless since the zone is public
-services.unbound.extraConfig = ''
-  stub-zone:
-    name: "autogeree.net"
-    stub-addr: 127.0.0.1@5353
+services.unbound.settings = {
+  stub-zone = {
+    name = domain;
+    stub-addr = "127.0.0.1@5353";
+  };
+};
 '';
 */
 }