forked from M-Labs/it-infra
aux: use 192.168.1.x on LAN
match default ARTIQ core device IPs
This commit is contained in:
parent
bc848547fd
commit
2448fe7d20
|
@ -40,7 +40,7 @@ in
|
||||||
};
|
};
|
||||||
networking.interfaces."${netifLan}" = {
|
networking.interfaces."${netifLan}" = {
|
||||||
ipv4.addresses = [{
|
ipv4.addresses = [{
|
||||||
address = "192.168.14.1";
|
address = "192.168.1.1";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
@ -70,13 +70,13 @@ in
|
||||||
interface=${netifWifi}
|
interface=${netifWifi}
|
||||||
interface=${netifLan}
|
interface=${netifLan}
|
||||||
bind-interfaces
|
bind-interfaces
|
||||||
dhcp-range=interface:${netifLan},192.168.14.81,192.168.14.254,24h
|
dhcp-range=interface:${netifLan},192.168.1.81,192.168.1.254,24h
|
||||||
dhcp-range=interface:${netifWifi},192.168.15.10,192.168.15.254,24h
|
dhcp-range=interface:${netifWifi},192.168.15.10,192.168.15.254,24h
|
||||||
|
|
||||||
no-resolv
|
no-resolv
|
||||||
|
|
||||||
# Static IPv4s to make port redirections work
|
# Static IPv4s to make port redirections work
|
||||||
dhcp-host=chiron,192.168.14.201
|
dhcp-host=chiron,192.168.1.201
|
||||||
|
|
||||||
# Google can't do DNS geolocation correctly and slows down websites of everyone using
|
# Google can't do DNS geolocation correctly and slows down websites of everyone using
|
||||||
# their shitty font cloud hosting. In HK, you sometimes get IPs behind the GFW that you
|
# their shitty font cloud hosting. In HK, you sometimes get IPs behind the GFW that you
|
||||||
|
@ -89,7 +89,7 @@ in
|
||||||
externalInterface = netifWan;
|
externalInterface = netifWan;
|
||||||
internalInterfaces = [ netifLan netifWifi ];
|
internalInterfaces = [ netifLan netifWifi ];
|
||||||
forwardPorts = [
|
forwardPorts = [
|
||||||
{ sourcePort = 2201; destination = "192.168.14.201:22"; proto = "tcp"; }
|
{ sourcePort = 2201; destination = "192.168.1.201:22"; proto = "tcp"; }
|
||||||
];
|
];
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
iptables -w -N block-lan-from-wifi
|
iptables -w -N block-lan-from-wifi
|
||||||
|
|
Loading…
Reference in New Issue