all repos — nixfiles @ 32902b259507a04fa202f92dacf59058da29cf67

System and user configuration, managed by nix and home-manager

router: complete partial revert of 2522c8da Too many things seem to get confused with this setup

Alin
commit

32902b259507a04fa202f92dacf59058da29cf67

parent

dbe8b208adac4ff68aa97e4958a351ee0c4ac968

1 file changed, 11 insertions(+), 37 deletions(-)

changed files
M system/roles/router.nix → system/roles/router.nix
@@ -48,9 +48,6 @@ mainProvider = dnsProviders.quad9;
 
   lanCfg = config.systemd.network.networks."40-${lan}";
   myAddresses = map netlib.removeMask (lib.filter (a: !(a ? Scope || a ? Label)) lanCfg.addresses);
-  dnsAddresses = map netlib.removeMask (
-    lib.filter (a: a ? Label && a.Label == "dns") lanCfg.addresses
-  );
 in
 {
   imports = [

@@ -132,22 +129,6 @@ Address = "${ulaPrefix}:42::1/48";
           }
           {
             Address = "10.0.0.1/16";
-          }
-          {
-            Address = "10.0.0.53/32";
-            Label = "dns";
-          }
-          {
-            Address = "${ulaPrefix}::53/48";
-            AddPrefixRoute = false;
-            Label = "dns"; # ignored in networkd, used for filtering here
-          }
-        ];
-        routes = [
-          {
-            Destination = "${ulaPrefix}::/48";
-            Metric = 128;
-            PreferredSource = "${ulaPrefix}:42::1";
           }
         ];
         networkConfig = {

@@ -172,7 +153,7 @@ };
         ipv6SendRAConfig = {
           Managed = true;
           OtherInformation = true;
-          DNS = builtins.filter netlib.isv6 dnsAddresses;
+          DNS = builtins.filter netlib.isv6 myAddresses;
         };
         ipv6Prefixes = [
           {

@@ -246,12 +227,13 @@ };
 
   services.adguardhome.settings =
     let
-      dnsmasqAddrs = map netlib.wrapv6 myAddresses;
+      mkHostPort = (addr: "${netlib.wrapv6 addr}:${toString config.services.dnsmasq.settings.port}");
+      dnsmasqAddrs = map mkHostPort (builtins.filter netlib.isv6 myAddresses);
       mkTLSHost = p: "tls://${p.hostname}";
     in
     {
       dns = {
-        bind_hosts = dnsAddresses;
+        bind_hosts = myAddresses;
 
         upstream_dns = (map mkTLSHost allProviders) ++ [
           # [/domain1/domain2/domainN/]upstreamString

@@ -272,7 +254,7 @@
   services.resolved = {
     enable = true;
     settings.Resolve = {
-      DNS = dnsAddresses;
+      DNS = myAddresses;
       FallbackDNS = map (p: map (ns: "${ns}#${p.hostname}") p.addresses) allProviders;
       LLMNR = false;
       MulticastDNS = true;

@@ -315,7 +297,8 @@ alwaysKeepRunning = true;
     resolveLocalQueries = false;
     settings = {
       domain = domain;
-      listen-address = myAddresses;
+      interface = lan;
+      port = 5553;
       bind-interfaces = true;
       enable-ra = false;
 

@@ -343,19 +326,10 @@ # [::] means the *global* address of the system running dnsmasq
         # [fd00::] refers to a ULA
         # [fe80::] refers to a link-local address
         "option:ntp-server,0.0.0.0"
-      ]
-      ++ (
-        if config.services.adguardhome.enable then
-          [
-            "option:dns-server,10.0.0.53"
-            "option6:dns-server,[${ulaPrefix}::53]"
-          ]
-        else
-          [
-            "option:dns-server,0.0.0.0"
-            "option6:dns-server,[fd00::],[fe80::]"
-          ]
-      );
+
+        "option:dns-server,0.0.0.0"
+        "option6:dns-server,[fd00::]"
+      ];
 
       no-resolv = true;
       dns-loop-detect = true;