diff --git a/dnsmasq.conf b/dnsmasq.conf index bc170d9..05fd722 100644 --- a/dnsmasq.conf +++ b/dnsmasq.conf @@ -14,10 +14,12 @@ dhcp-host=dragon,10.0.0.10,12h dhcp-host=faceless,10.0.0.210,12h dhcp-host=frontdoorcam,10.0.0.89,9c:8e:cd:2b:71:e9,120m -dhcp-host=velop1,10.0.0.49,24:f5:a2:b0:86:2e +dhcp-host=velop1,10.0.0.49,24:f5:a2:b0:86:2e,120m +dhcp-host=velop-kitchen,10.0.0.139,24:f5:a2:b0:8b:3e,120m +dhcp-host=velop-upstairs,10.0.0.137,30:23:03:97:1c:43,120m # k8s nodes -dhcp-host=bald,10.0.0.244,d0:50:99:26:89:86,2m # formerly: ourcraft +dhcp-host=bald,10.0.0.244,d0:50:99:26:89:86,120m # formerly: ourcraft dhcp-host=chromebox,10.0.0.138,b4:a9:fc:17:86:a5,120m dhcp-host=datto1,10.0.0.81,78:f2:9e:91:44:c9,120m diff --git a/etc-hosts b/etc-hosts index ab46902..1585fb2 100644 --- a/etc-hosts +++ b/etc-hosts @@ -29,7 +29,9 @@ 10.0.0.210 video.h.lyte.dev 10.0.0.210 video.lyte.dev +10.0.0.81 kube-cluster.home.lyte.dev 10.0.0.138 kube-cluster.home.lyte.dev +10.0.0.244 kube-cluster.home.lyte.dev # 10.0.0.81 kube-cluster.home.lyte.dev 10.0.0.210 dmf.me @@ -38,5 +40,5 @@ 10.0.0.210 ranch-talk.h.lyte.dev -10.0.0.244 ourcraft.lyte.dev +10.0.0.138 ourcraft.lyte.dev 10.0.0.244 factorio.lyte.dev diff --git a/link.fish b/link.fish index 56ba429..bf78e42 100755 --- a/link.fish +++ b/link.fish @@ -32,4 +32,5 @@ recopy wan0.link /etc/systemd/network/10-wan0.link recopy dhcpcd.conf /etc/dhcpcd.conf # hosts file -recopy ./etc-hosts /etc/hosts +recopy ./etc-hosts /etc/hblock/header +# hblock # temporary disable hblock because Val loves ads diff --git a/nftables.conf b/nftables.conf index 812cfba..1b38580 100644 --- a/nftables.conf +++ b/nftables.conf @@ -61,8 +61,8 @@ table ip nat { iifname $WAN udp dport 9876-9877 dnat to 10.0.0.10 # ourcraft - iifname $WAN tcp dport { 25565, 34197 } dnat to 10.0.0.244 - iifname $WAN udp dport { 25565, 34197 } dnat to 10.0.0.244 + iifname $WAN tcp dport { 25565, 34197 } dnat to 10.0.0.138 + iifname $WAN udp dport { 25565, 34197 } dnat to 10.0.0.138 } chain output {