From 3a1ac20e168489ed899b5e94954e61368b7aab75 Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Mon, 1 Jan 2024 20:51:02 +0530 Subject: Revert "kay/network: switch lan and wan port" This reverts commit cb0606d7935d9c8cf35ce095c5c7b91a61fa683a. --- hosts/kay/modules/network.nix | 4 +--- hosts/kay/modules/router.nix | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'hosts/kay') diff --git a/hosts/kay/modules/network.nix b/hosts/kay/modules/network.nix index 0601815..c31765b 100644 --- a/hosts/kay/modules/network.nix +++ b/hosts/kay/modules/network.nix @@ -2,7 +2,7 @@ let inetVlan = 722; - wanInterface = "enp0s20u1"; + wanInterface = "enp4s0"; nameServer = "1.0.0.1"; domain = config.userdata.domain; in @@ -24,8 +24,6 @@ in id = inetVlan; interface = wanInterface; }; - # isp checks this macid during ppp authentication - interfaces.${wanInterface}.macAddress = "c4:54:44:d5:17:68"; }; services = { diff --git a/hosts/kay/modules/router.nix b/hosts/kay/modules/router.nix index c621620..cc9aaae 100644 --- a/hosts/kay/modules/router.nix +++ b/hosts/kay/modules/router.nix @@ -1,7 +1,7 @@ { ... }: let - lanInterface = "enp4s0"; + lanInterface = "enp0s20u1"; wanInterface = "ppp0"; subnet = "10.0.0.0"; prefix = 24; @@ -24,12 +24,6 @@ in address = host; prefixLength = prefix; }]; - # the mac id of the built-in nic is required for - # ppp authentication with isp, this is here to avoid - # mac address collision since it's original mac id is used - # by the new wan interface for ppp authentication - # see ./network.nix - macAddress = "40:ed:00:08:ba:be"; }; firewall = { allowedUDPPorts = [ 53 67 ]; -- cgit v1.2.3