6 Commits
4 changed files with 19 additions and 9 deletions
+4 -4
View File
@@ -35,14 +35,14 @@
# Tailscale hosts # Tailscale hosts
100.119.228.115 nas.home chronicles.shire-zebra.ts.net 100.119.228.115 nas.home chronicles.shire-zebra.ts.net
100.88.91.27 dns.home 100.88.91.27 dns.home
100.70.99.91 exodus.home exodus.shire-zebra.ts.net 100.80.99.48 exodus.home
100.96.198.104 genesis.home genesis.shire-zebra.ts.net smart.home zwave.home nixcache.home gitcache.home dashy.home uptime.home speed.home 100.96.198.104 genesis.home smart.home zwave.home nixcache.home gitcache.home dashy.home uptime.home speed.home
100.117.28.111 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan 100.117.28.111 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
100.68.203.1 hosea.home hosea.shire-zebra.ts.net grafana.home 100.68.203.1 hosea.home hosea.shire-zebra.ts.net grafana.home
100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net pgadmin.kubernetes longhorn.kubernetes 100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net pgadmin.kubernetes longhorn.kubernetes
100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net matrix.kubernetes immich.kubernetes postgres.kubernetes 100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net matrix.kubernetes immich.kubernetes postgres.kubernetes
100.90.74.19 zeke.home zeke.shire-zebra.ts.net 100.90.74.19 zeke.home
100.109.86.8 linode.home linode.shire-zebra.ts.net 100.115.57.8 linode.home
100.65.5.38 matrix.home matrix.shire-zebra.ts.net 100.65.5.38 matrix.home matrix.shire-zebra.ts.net
#100.127.55.22 jellyfin.home #100.127.55.22 jellyfin.home
100.114.187.61 nas1.home nas1.shire-zebra.ts.net 100.114.187.61 nas1.home nas1.shire-zebra.ts.net
+14 -1
View File
@@ -9,7 +9,7 @@ let
lanIP = metadata.hosts.${config.networking.hostName}.ip; lanIP = metadata.hosts.${config.networking.hostName}.ip;
iot = "enp2s0"; iot = "enp2s0";
iotIP = "192.168.66.250"; iotIP = "192.168.66.250";
#routerIP = metadata.infra.gw; routerIP = metadata.infra.gw;
extraHosts = builtins.readFile ./net/hosts; extraHosts = builtins.readFile ./net/hosts;
proxyPort = 3128; proxyPort = 3128;
@@ -81,6 +81,19 @@ in
environment.etc."hosts.d/local".text = extraHosts; environment.etc."hosts.d/local".text = extraHosts;
services = { services = {
kea = {
dhcp4 = (
import ./networking/dhcp.nix {
inherit
iot
lan
lanIP
routerIP
;
}
);
};
######### #########
# dnsmasq config # dnsmasq config
######## ########
-3
View File
@@ -67,9 +67,6 @@ in
443 443
5432 5432
6443 6443
8080
8443
10250
] ]
++ ( ++ (
if cfg.agentOnly then if cfg.agentOnly then
+1 -1
View File
@@ -15,7 +15,7 @@
"exodus": { "exodus": {
"ip": null, "ip": null,
"pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxmnCj2E9DxcnefPW+n4yCuLShxqr0p024riogdeXA3", "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxmnCj2E9DxcnefPW+n4yCuLShxqr0p024riogdeXA3",
"ts": "100.70.99.91", "ts": "100.80.99.48",
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"genesis": { "genesis": {