From dbc288c813aa88c341d22e349de510f0b966c3fe Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 5 Mar 2021 18:42:54 +0800
Subject: [PATCH] fix IP for rpi-5, rename to rpi-ext

---
 nixbld-etc-nixos/configuration.nix | 8 +++++---
 nixops/nixops.nix                  | 2 +-
 nixops/rpi-server.nix              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 5d6c42ba..8930fef1 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -58,7 +58,7 @@ in
       ipv4.routes = [{
         address = "192.168.13.0";
         prefixLength = 24;
-        via = "192.168.1.205";
+        via = "192.168.1.30";
       }];
       ipv6.routes = [{
         address = "2001:470:f821:3::";
@@ -85,7 +85,6 @@ in
         { sourcePort = 2202; destination = "192.168.1.202:22"; proto = "tcp"; }
         { sourcePort = 2203; destination = "192.168.1.203:22"; proto = "tcp"; }
         { sourcePort = 2204; destination = "192.168.1.204:22"; proto = "tcp"; }
-        { sourcePort = 2205; destination = "192.168.1.205:22"; proto = "tcp"; }
       ];
       extraCommands = ''
         iptables -w -N block-lan-from-wifi
@@ -161,9 +160,11 @@ in
       dhcp-host=rpi-2,192.168.1.202
       dhcp-host=rpi-3,192.168.1.203
       dhcp-host=rpi-4,192.168.1.204
-      dhcp-host=rpi-5,192.168.1.205
 
       # Static IP addresses for non-DHCP boards
+      address=/rpi-ext/192.168.1.30
+      address=/rpi-ext/2001:470:f821:1:dea6:32ff:fe95:2fcf
+
       address=/thermostat/192.168.1.26
       address=/powercycler/192.168.1.31
       address=/kc705/192.168.1.50
@@ -177,6 +178,7 @@ in
       address=/kasli/192.168.1.70
       address=/kasli-customer/192.168.1.75
       address=/stabilizer-customer/192.168.1.76
+
       # uTCA MCH from NAT
       address=/tschernobyl/192.168.1.80
     '';
diff --git a/nixops/nixops.nix b/nixops/nixops.nix
index ea014cf2..3ca9e750 100644
--- a/nixops/nixops.nix
+++ b/nixops/nixops.nix
@@ -5,7 +5,7 @@
   rpi-2 = import ./rpi.nix { host = "rpi-2"; rpi4 = false; experimental-users = true; };
   rpi-3 = import ./rpi.nix { host = "rpi-3"; rpi4 = true; };
   rpi-4 = import ./rpi.nix { host = "rpi-4"; rpi4 = true; };
-  rpi-5 = import ./rpi-server.nix { host = "rpi-5"; rpi4 = true; };
+  rpi-ext = import ./rpi-server.nix { host = "rpi-ext"; rpi4 = true; };
   juno = import ./desktop.nix { host = "juno"; };
   zeus = import ./desktop.nix { host = "zeus"; };
   hera = import ./desktop.nix { host = "hera"; };
diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index b4118d99..21d201e3 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -64,7 +64,7 @@
   };
   networking.interfaces.eth0 = {
     ipv4.addresses = [{
-      address = "192.168.1.205";
+      address = "192.168.1.30";
       prefixLength = 24;
     }];
     ipv6.addresses = [{