diff --git a/config/hardware/limina.nix b/config/hardware/limina.nix
index 6c970d8..ae5ee8d 100644
--- a/config/hardware/limina.nix
+++ b/config/hardware/limina.nix
@@ -67,10 +67,6 @@ with lib; {
hostId = substring 0 8 (fileContents /state/etc/machine-id);
macvlans = {
- extif0 = {
- interface = "enp1s0";
- mode = "bridge";
- };
intif0 = {
interface = "enp2s0";
mode = "bridge";
@@ -86,18 +82,13 @@ with lib; {
};
interfaces = {
- enp1s0.useDHCP = false;
enp2s0.useDHCP = false;
enp3s0.useDHCP = false;
enp4s0.useDHCP = false;
# output of: echo limina-${if}|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
- extif0 = { macAddress = "02:fd:79:94:a2:a8"; };
-
intif0 = { macAddress = "02:dc:59:b4:a7:8c"; };
-
intif1 = { macAddress = "02:df:43:1d:8a:63"; };
-
intif2 = { macAddress = "02:55:d9:05:23:36"; };
};
};
diff --git a/config/host-config/limina.nix b/config/host-config/limina.nix
index c716753..e164d77 100644
--- a/config/host-config/limina.nix
+++ b/config/host-config/limina.nix
@@ -2,7 +2,7 @@
with lib;
let
- primary-ip = "10.0.0.6";
+ primary-ip = "10.0.0.1";
host-config = config.fudo.hosts.${config.instance.hostname};
site-name = host-config.site;
@@ -28,7 +28,7 @@ in {
};
interfaces = {
- extif0 = { useDHCP = true; };
+ enp1s0 = { useDHCP = true; };
intif0 = {
useDHCP = false;
@@ -43,14 +43,14 @@ in {
nat = {
enable = true;
- externalInterface = "extif0";
+ externalInterface = "enp1s0";
internalInterfaces = [ "intif0" ];
};
};
fudo = {
local-network = {
- enable = false;
+ enable = true;
domain = domain-name;
dns-servers = [ primary-ip ];
gateway = primary-ip;
@@ -69,7 +69,7 @@ in {
ipv4 = true;
ipv6 = true;
user = "fudo-client";
- external-interface = "extif0";
+ external-interface = "enp1s0";
password-file = "/srv/client/secure/client.passwd";
};
diff --git a/config/networks.nix b/config/networks.nix
index 744ee27..ce7c00c 100644
--- a/config/networks.nix
+++ b/config/networks.nix
@@ -3,6 +3,6 @@
{
config.fudo.networks = {
"rus.selby.ca" = import ./networks/rus.selby.ca.nix { inherit config lib; };
- "sea.fudo.org" = import ./networks/rus.selby.ca.nix { inherit config lib; };
+ "sea.fudo.org" = import ./networks/sea.fudo.org.nix { inherit config lib; };
};
}
diff --git a/config/networks/sea.fudo.org.nix b/config/networks/sea.fudo.org.nix
index 3cc9857..755ab98 100644
--- a/config/networks/sea.fudo.org.nix
+++ b/config/networks/sea.fudo.org.nix
@@ -1,32 +1,27 @@
+{ config, lib, ... }:
+
let local-domain = "sea.fudo.org";
in {
- domain = "${local-domain}";
-
aliases = {
- kadmin = "nostromo";
- kdc = "nostromo";
+ deploy = "plato";
+ gateway = "limina";
+ # kadmin = "nostromo";
+ # kdc = "nostromo";
photo = "doraemon";
music = "doraemon";
panopticon = "lambda";
panopticon-od = "lambda";
ipfs = "nostromo";
- hole = "nostromo";
- pihole = "nostromo";
- dns-hole = "nostromo";
- mon-1 = "srv-1";
+ hole = "limina";
+ pihole = "limina";
+ dns-hole = "limina";
};
- network = "10.0.0.0/16";
-
- dhcp-dynamic-network = "10.0.1.0/24";
-
- enable-reverse-mappings = true;
-
srv-records = {
tcp = {
domain = [{
port = 53;
- host = "nostromo.sea.fudo.org";
+ host = "limina.sea.fudo.org";
}];
kerberos = [{
port = 88;
@@ -38,7 +33,7 @@ in {
}];
ssh = [{
port = 22;
- host = "nostromo.sea.fudo.org";
+ host = "limina.sea.fudo.org";
}];
ldap = [{
port = 389;
@@ -49,7 +44,7 @@ in {
udp = {
domain = [{
port = 53;
- host = "nostromo.sea.fudo.org";
+ host = "limina.sea.fudo.org";
}];
kerberos = [{
port = 88;
@@ -68,153 +63,150 @@ in {
hosts = {
limina = {
- ip-address = "10.0.0.6";
+ ipv4-address = "10.0.0.1";
mac-address = "02:fd:79:94:a2:a8";
- };
- nostromo = {
- ip-address = "10.0.0.1";
- mac-address = "46:54:76:06:f1:10";
- };
- lm = {
- ip-address = "10.0.0.2";
- mac-address = "00:23:7d:e6:d9:ea";
- };
- lambda = {
- ip-address = "10.0.0.3";
- mac-address = "02:50:f6:52:9f:9d";
};
switch-master = {
- ip-address = "10.0.0.5";
+ ipv4-address = "10.0.0.5";
mac-address = "00:14:1C:B6:BB:40";
};
google-wifi = {
- ip-address = "10.0.0.7";
+ ipv4-address = "10.0.0.7";
mac-address = "7C:D9:5C:9F:6F:E9";
};
+ nostromo = {
+ ipv4-address = "10.0.0.10";
+ mac-address = "46:54:76:06:f1:10";
+ };
+ lambda = {
+ ipv4-address = "10.0.0.11";
+ mac-address = "02:50:f6:52:9f:9d";
+ };
+ plato = { ipv4-address = "10.0.0.21"; };
cam-entrance = {
- ip-address = "10.0.0.31";
+ ipv4-address = "10.0.0.31";
mac-address = "9c:8e:cd:0e:99:7b";
};
cam-driveway = {
- ip-address = "10.0.0.32";
+ ipv4-address = "10.0.0.32";
mac-address = "9c:8e:cd:0d:3b:09";
};
cam-deck = {
- ip-address = "10.0.0.33";
+ ipv4-address = "10.0.0.33";
mac-address = "9c:8e:cd:0e:98:c8";
};
cargo = {
- ip-address = "10.0.0.50";
+ ipv4-address = "10.0.0.50";
mac-address = "00:11:32:75:d8:b7";
};
whitedwarf = {
- ip-address = "10.0.0.51";
+ ipv4-address = "10.0.0.51";
mac-address = "00:11:32:12:14:1d";
};
doraemon = {
- ip-address = "10.0.0.52";
+ ipv4-address = "10.0.0.52";
mac-address = "00:11:32:0a:06:c5";
};
android = {
- ip-address = "10.0.0.81";
+ ipv4-address = "10.0.0.81";
mac-address = "00:16:3e:43:39:fc";
};
retro-wired = {
- ip-address = "10.0.0.82";
+ ipv4-address = "10.0.0.82";
mac-address = "dc:a6:32:6b:57:43";
};
retro = {
- ip-address = "10.0.0.83";
+ ipv4-address = "10.0.0.83";
mac-address = "dc:a6:32:6b:57:45";
};
monolith = {
- ip-address = "10.0.0.100";
+ ipv4-address = "10.0.0.100";
mac-address = "6c:62:6d:c8:b0:d8";
};
taipan = {
- ip-address = "10.0.0.107";
+ ipv4-address = "10.0.0.107";
mac-address = "52:54:00:34:c4:78";
};
spark = {
- ip-address = "10.0.0.108";
+ ipv4-address = "10.0.0.108";
mac-address = "02:9c:b7:b6:ad:c4";
};
hyperion = {
- ip-address = "10.0.0.109";
+ ipv4-address = "10.0.0.109";
mac-address = "52:54:00:33:46:de";
};
zbox = {
- ip-address = "10.0.0.110";
- mac-address = "02:dd:80:52:83:9b";
+ ipv4-address = "10.0.0.110";
+ mac-address = "02:DD:80:52:83:9B";
};
ubiquiti-wifi = {
- ip-address = "10.0.0.126";
+ ipv4-address = "10.0.0.126";
mac-address = "04:18:d6:20:48:fb";
};
generator-wireless = {
- ip-address = "10.0.0.130";
+ ipv4-address = "10.0.0.130";
mac-address = "B8:27:EB:A6:32:26";
};
brother-wireless = {
- ip-address = "10.0.0.160";
+ ipv4-address = "10.0.0.160";
mac-address = "c0:38:96:64:49:65";
};
nest = {
- ip-address = "10.0.0.176";
+ ipv4-address = "10.0.0.176";
mac-address = "18:b4:30:16:7c:5a";
};
xixi-phone = {
- ip-address = "10.0.0.193";
+ ipv4-address = "10.0.0.193";
mac-address = "48:43:7c:75:89:42";
};
ipad = {
- ip-address = "10.0.0.202";
+ ipv4-address = "10.0.0.202";
mac-address = "9c:35:eb:48:6e:71";
};
cam-front = {
- ip-address = "10.0.0.203";
+ ipv4-address = "10.0.0.203";
mac-address = "c4:d6:55:3e:b4:c3";
};
family-tv = {
- ip-address = "10.0.0.205";
+ ipv4-address = "10.0.0.205";
mac-address = "84:a4:66:3a:b1:f8";
};
babycam = {
- ip-address = "10.0.0.206";
+ ipv4-address = "10.0.0.206";
mac-address = "08:ea:40:59:5f:9e";
};
workphone = {
- ip-address = "10.0.0.211";
+ ipv4-address = "10.0.0.211";
mac-address = "a8:8e:24:5c:12:67";
};
chromecast-2 = {
- ip-address = "10.0.0.215";
+ ipv4-address = "10.0.0.215";
mac-address = "a4:77:33:59:a2:ba";
};
front-light = {
- ip-address = "10.0.0.221";
+ ipv4-address = "10.0.0.221";
mac-address = "94:10:3e:48:94:ed";
};
# Ceph network
srv-1 = {
- ip-address = "10.0.10.1";
+ ipv4-address = "10.0.10.1";
mac-address = "02:65:d7:00:7d:1b";
};
node-1 = {
- ip-address = "10.0.10.101";
+ ipv4-address = "10.0.10.101";
mac-address = "00:1e:06:36:81:cf";
};
node-2 = {
- ip-address = "10.0.10.102";
+ ipv4-address = "10.0.10.102";
mac-address = "00:1e:06:36:ec:3e";
};
node-3 = {
- ip-address = "10.0.10.103";
+ ipv4-address = "10.0.10.103";
mac-address = "00:1e:06:36:ec:4b";
};
node-4 = {
- ip-address = "10.0.10.104";
+ ipv4-address = "10.0.10.104";
mac-address = "00:1e:06:36:dd:8c";
};
};