summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-03-17 15:42:13 +0100
committerlassulus <lassulus@lassul.us>2021-03-17 15:42:13 +0100
commit3d1472a7cac3ab2c5f9efd06a501368308681999 (patch)
tree950fbe49dfd060923756dd517c41f27f646857de /krebs
parentf659c1879f6e0a0e9228205edd794aaab467aa0b (diff)
parent2044ad632b68ce173463287a9f437aae699bda83 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/1systems/puyak/net.nix6
-rw-r--r--krebs/3modules/makefu/default.nix19
2 files changed, 3 insertions, 22 deletions
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;
}
];
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 = [