From e15f7aaf4d77b75b1f9c759953e2c6653c93c702 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 14 Jan 2025 22:19:27 +0100 Subject: [PATCH] feat: allow smb access from fritz-vlan --- config/services/adguardhome.nix | 4 ++-- hosts/nucnix/hostapd.nix | 4 +--- hosts/nucnix/net.nix | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/services/adguardhome.nix b/config/services/adguardhome.nix index d3ab6af..18537c3 100644 --- a/config/services/adguardhome.nix +++ b/config/services/adguardhome.nix @@ -41,8 +41,8 @@ ]; }; user_rules = [ - "||homematic.internal^$dnsrewrite=${lib.net.cidr.host 30 globals.net.vlans.devices.cidrv4}" - "||testberry.internal^$dnsrewrite=${lib.net.cidr.host 31 globals.net.vlans.devices.cidrv4}" + # "||homematic.internal^$dnsrewrite=${lib.net.cidr.host 30 globals.net.vlans.devices.cidrv4}" + # "||testberry.internal^$dnsrewrite=${lib.net.cidr.host 31 globals.net.vlans.devices.cidrv4}" "||smb.internal^$dnsrewrite=${lib.net.cidr.host globals.services.samba.ip globals.net.vlans.home.cidrv4}" "||${globals.domains.web}^$dnsrewrite=${lib.net.cidr.host 1 globals.net.vlans.services.cidrv4}" "@@||${globals.services.vaultwarden.domain}" diff --git a/hosts/nucnix/hostapd.nix b/hosts/nucnix/hostapd.nix index d73ec39..31b98f2 100644 --- a/hosts/nucnix/hostapd.nix +++ b/hosts/nucnix/hostapd.nix @@ -62,9 +62,7 @@ networks.wlan01 = { inherit (globals.hostapd) ssid; apIsolate = true; - # not supporte by laptop :( - #settings.ieee80211w = 0; - logLevel = 0; + #logLevel = 0; settings = { bridge = "br-iot"; }; diff --git a/hosts/nucnix/net.nix b/hosts/nucnix/net.nix index d0358d8..a34bf9f 100644 --- a/hosts/nucnix/net.nix +++ b/hosts/nucnix/net.nix @@ -171,6 +171,7 @@ in printer-smb = { from = [ "printer" + "fritz" ]; to = [ "smb" ]; allowedTCPPorts = [ 445 ]; @@ -200,8 +201,10 @@ in from = [ "home" "devices" + "fritz" "guests" "services" + "fritz" ]; to = [ "adguard" ]; allowedUDPPorts = [ 53 ];