From 77c0477bd007f5d0c56f66bb8584bfc9c8a1a7e4 Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 18 Jan 2022 21:06:02 +0100 Subject: [PATCH] vxlan over wireless: fix --- nix/pkgs/ap.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/pkgs/ap.nix b/nix/pkgs/ap.nix index db65836..c3767f7 100644 --- a/nix/pkgs/ap.nix +++ b/nix/pkgs/ap.nix @@ -240,9 +240,9 @@ in '' uci set network.${net}.ipaddr=${config.site.net.${net}.hosts4.${hostName}} uci set network.${net}.netmask=${self.lib.netmasks.${toString config.site.net.${net}.subnet4Len}} ''} - ${lib.concatMapStrings (ctx: lib.optionalString (ctx ? ${hostName}) '' - uci set network.mgmt.ip6addr=${config.site.net.${net}.hosts6.${ctx}.${hostName}}/64 - '') (builtins.attrNames config.site.net.${net}.hosts6)} + ${lib.concatMapStrings (hosts6: lib.optionalString (hosts6 ? ${hostName}) '' + uci set network.${net}.ip6addr=${hosts6.${hostName}}/64 + '') (builtins.attrValues config.site.net.${net}.hosts6)} '') (builtins.attrNames hostConfig.interfaces) } @@ -252,7 +252,7 @@ in '' iface = hostConfig.interfaces.${name}; in optionalString (iface.type == "vxlan") '' uci set network.${name}=interface - uci set network.${name}.proto=vxlan + uci set network.${name}.proto=vxlan6 uci set network.${name}.peer6addr='${iface.vxlan.peer}' uci set network.${name}.port=4789 uci set network.${name}.mtu=1600