all repos — nixfiles @ 948c3da3c9301a8f273d139f20b1dfc46303d63b

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

router: move `address` network entries to `addresses`

Alin
commit

948c3da3c9301a8f273d139f20b1dfc46303d63b

parent

05fc76759bc5a48f2994da2e6b5fc107110cdecd

1 file changed, 7 insertions(+), 5 deletions(-)

changed files
M system/roles/router.nix → system/roles/router.nix
@@ -47,7 +47,7 @@ allProviders = lib.attrValues dnsProviders;
   mainProvider = dnsProviders.quad9;
 
   lanCfg = config.systemd.network.networks."40-${lan}";
-  myAddresses = map netlib.removeMask lanCfg.address;
+  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
   );

@@ -122,14 +122,16 @@ };
     networks = {
       "40-${lan}" = {
         matchConfig.Name = lan;
-        address = [
-          "${ulaPrefix}:42::1/48"
-          "10.0.0.1/16"
-        ];
         addresses = [
           {
             Address = "fe80::1/64";
             Scope = "link";
+          }
+          {
+            Address = "${ulaPrefix}:42::1/48";
+          }
+          {
+            Address = "10.0.0.1/16";
           }
           {
             Address = "10.0.0.53/32";