From d0fc18d22885cc1e2a92714f363993c063909db2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 8 Mar 2021 21:52:41 +0100
Subject: k 3 ma: remove dot lan

---
 krebs/3modules/makefu/default.nix | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index c8e1e0386..f9fa037d3 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -108,12 +108,6 @@ in {
       ci = false;
       cores = 1;
       nets = {
-        lan = {
-          ip4.addr = "192.168.1.12";
-          aliases = [
-            "filepimp.lan"
-          ];
-        };
         retiolum.ip4.addr = "10.243.153.102";
       };
     };
@@ -123,12 +117,6 @@ in {
       cores = 2;
 
       nets = {
-        lan = {
-          ip4.addr = "192.168.1.11";
-          aliases = [
-            "omo.lan"
-          ];
-        };
         retiolum = {
           ip4.addr = "10.243.0.89";
           aliases = [
@@ -143,13 +131,6 @@ in {
       ci = true;
       cores = 4;
       nets = {
-        lan = {
-          ip4.addr = "192.168.8.11";
-          aliases = [
-            "wbob.lan"
-            "log.wbob.lan"
-          ];
-        };
         retiolum = {
           ip4.addr = "10.243.214.15";
           aliases = [
-- 
cgit v1.2.3


From fe393ec4e753f2b84439eb719613a9fa79ec0c15 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 12 Mar 2021 20:34:01 +0100
Subject: puyak.r: rename interface, use correct subnet

---
 krebs/1systems/puyak/net.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/1systems/puyak/net.nix b/krebs/1systems/puyak/net.nix
index 4cb8d247c..8dab11e16 100644
--- a/krebs/1systems/puyak/net.nix
+++ b/krebs/1systems/puyak/net.nix
@@ -1,11 +1,11 @@
 let
-  ext-if = "enp0s25";
+  ext-if = "et0";
   shack-ip = "10.42.22.184";
   shack-gw = "10.42.20.1";
 in {
   services.udev.extraRules = ''
     SUBSYSTEM=="net", ATTR{address}=="8c:70:5a:b2:84:58", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="et0"
+    SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="${ext-if}"
   '';
   networking = {
     firewall.enable = false;
@@ -13,7 +13,7 @@ in {
     interfaces."${ext-if}".ipv4.addresses = [
       {
         address = shack-ip;
-        prefixLength = 20;
+        prefixLength = 22;
       }
     ];
 
-- 
cgit v1.2.3