From 8658e1694a9d8429177e20cd59fe9bf5282f72d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Apr 2024 10:56:37 +0200 Subject: [PATCH] rework multicast support --- nixosModules/clanCore/networking.nix | 11 +++-------- nixosModules/clanCore/zerotier/default.nix | 4 ---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/nixosModules/clanCore/networking.nix b/nixosModules/clanCore/networking.nix index 36b5253c..e5dcbc70 100644 --- a/nixosModules/clanCore/networking.nix +++ b/nixosModules/clanCore/networking.nix @@ -74,14 +74,9 @@ systemd.services.NetworkManager-wait-online.enable = false; systemd.network.wait-online.enable = false; - systemd.network.networks."99-ethernet-default-dhcp".networkConfig = { - MulticastDNS = lib.mkDefault "yes"; - LLMNR = lib.mkDefault "yes"; - }; - systemd.network.networks."99-wireless-client-dhcp".networkConfig = { - MulticastDNS = lib.mkDefault "yes"; - LLMNR = lib.mkDefault "yes"; - }; + systemd.network.networks."99-ethernet-default-dhcp".networkConfig.MulticastDNS = lib.mkDefault "yes"; + systemd.network.networks."99-wireless-client-dhcp".networkConfig.MulticastDNS = lib.mkDefault "yes"; + networking.firewall.allowedUDPPorts = [ 5353 ]; # Multicast DNS # Use networkd instead of the pile of shell scripts networking.useNetworkd = lib.mkDefault true; diff --git a/nixosModules/clanCore/zerotier/default.nix b/nixosModules/clanCore/zerotier/default.nix index c89e7460..ef013340 100644 --- a/nixosModules/clanCore/zerotier/default.nix +++ b/nixosModules/clanCore/zerotier/default.nix @@ -103,7 +103,6 @@ in systemd.network.networks."09-zerotier" = { matchConfig.Name = "zt*"; networkConfig = { - LLMNR = true; LLDP = true; MulticastDNS = true; KeepConfiguration = "static"; @@ -160,9 +159,6 @@ in ''}" ]; - networking.firewall.interfaces."zt+".allowedTCPPorts = [ 5353 ]; # mdns - networking.firewall.interfaces."zt+".allowedUDPPorts = [ 5353 ]; # mdns - networking.firewall.allowedTCPPorts = [ 9993 ]; # zerotier networking.firewall.allowedUDPPorts = [ 9993 ]; # zerotier