harry
/
it-infra
forked from M-Labs/it-infra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix IP for rpi-5, rename to rpi-ext

This commit is contained in:
Sebastien Bourdeauducq 2021-03-05 18:42:54 +08:00
parent 4da3cd5325
commit dbc288c813
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixbld-etc-nixos/configuration.nix
View File

@ -58,7 +58,7 @@ in
ipv4.routes = [{ ipv4.routes = [{
address = "192.168.13.0"; address = "192.168.13.0";
prefixLength = 24; prefixLength = 24;
via = "192.168.1.205"; via = "192.168.1.30";
}]; }];
ipv6.routes = [{ ipv6.routes = [{
address = "2001:470:f821:3::"; address = "2001:470:f821:3::";
@ -85,7 +85,6 @@ in
{ sourcePort = 2202; destination = "192.168.1.202:22"; proto = "tcp"; } { sourcePort = 2202; destination = "192.168.1.202:22"; proto = "tcp"; }
{ sourcePort = 2203; destination = "192.168.1.203:22"; proto = "tcp"; } { sourcePort = 2203; destination = "192.168.1.203:22"; proto = "tcp"; }
{ sourcePort = 2204; destination = "192.168.1.204:22"; proto = "tcp"; } { sourcePort = 2204; destination = "192.168.1.204:22"; proto = "tcp"; }
{ sourcePort = 2205; destination = "192.168.1.205:22"; proto = "tcp"; }
]; ];
extraCommands = '' extraCommands = ''
iptables -w -N block-lan-from-wifi iptables -w -N block-lan-from-wifi
@ -161,9 +160,11 @@ in
dhcp-host=rpi-2,192.168.1.202 dhcp-host=rpi-2,192.168.1.202
dhcp-host=rpi-3,192.168.1.203 dhcp-host=rpi-3,192.168.1.203
dhcp-host=rpi-4,192.168.1.204 dhcp-host=rpi-4,192.168.1.204
dhcp-host=rpi-5,192.168.1.205
# Static IP addresses for non-DHCP boards # 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=/thermostat/192.168.1.26
address=/powercycler/192.168.1.31 address=/powercycler/192.168.1.31
address=/kc705/192.168.1.50 address=/kc705/192.168.1.50
@ -177,6 +178,7 @@ in
address=/kasli/192.168.1.70 address=/kasli/192.168.1.70
address=/kasli-customer/192.168.1.75 address=/kasli-customer/192.168.1.75
address=/stabilizer-customer/192.168.1.76 address=/stabilizer-customer/192.168.1.76
# uTCA MCH from NAT # uTCA MCH from NAT
address=/tschernobyl/192.168.1.80 address=/tschernobyl/192.168.1.80
''; '';

2
nixops/nixops.nix
View File

@ -5,7 +5,7 @@
rpi-2 = import ./rpi.nix { host = "rpi-2"; rpi4 = false; experimental-users = true; }; rpi-2 = import ./rpi.nix { host = "rpi-2"; rpi4 = false; experimental-users = true; };
rpi-3 = import ./rpi.nix { host = "rpi-3"; rpi4 = true; }; rpi-3 = import ./rpi.nix { host = "rpi-3"; rpi4 = true; };
rpi-4 = import ./rpi.nix { host = "rpi-4"; 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"; }; juno = import ./desktop.nix { host = "juno"; };
zeus = import ./desktop.nix { host = "zeus"; }; zeus = import ./desktop.nix { host = "zeus"; };
hera = import ./desktop.nix { host = "hera"; }; hera = import ./desktop.nix { host = "hera"; };

2
nixops/rpi-server.nix
View File

@ -64,7 +64,7 @@
}; };
networking.interfaces.eth0 = { networking.interfaces.eth0 = {
ipv4.addresses = [{ ipv4.addresses = [{
address = "192.168.1.205"; address = "192.168.1.30";
prefixLength = 24; prefixLength = 24;
}]; }];
ipv6.addresses = [{ ipv6.addresses = [{