This commit is contained in:
Daniel Flanagan 2023-10-11 02:35:06 +00:00
parent e4e9be507e
commit dca612a391
5 changed files with 53 additions and 47 deletions

View File

@ -1,4 +1,7 @@
duid duid
# No way.... https://github.com/NetworkConfiguration/dhcpcd/issues/36#issuecomment-954777644
# issues caused by guests with oneplus devices
noarp noarp
persistent persistent
vendorclassid vendorclassid
@ -14,7 +17,7 @@ slaac private
noipv4ll noipv4ll
noipv6rs noipv6rs
static domain_name_servers=10.0.0.1 static domain_name_servers=192.168.0.1
interface wan0 interface wan0
gateway gateway
@ -25,6 +28,6 @@ interface wan0
ia_pd 1 lan0 ia_pd 1 lan0
interface lan0 interface lan0
static ip_address=10.0.0.1/8 static ip_address=192.168.0.1/16
static routers=10.0.0.1 static routers=192.168.0.1
static domain_name_servers=10.0.0.1 static domain_name_servers=192.168.0.1

View File

@ -1,5 +1,5 @@
# server endpoints # server endpoints
listen-address=::1,127.0.0.1,10.0.0.1 listen-address=::1,127.0.0.1,192.168.0.1
port=53 port=53
# DNS cache entries # DNS cache entries
@ -20,29 +20,30 @@ interface=lan0
enable-ra enable-ra
# dhcp-option=121,10.0.0.0/8,10.0.0.1 # dhcp-option=121,192.168.0.0/16,192.168.0.1
dhcp-range=lan,10.0.0.5,10.0.0.250,255.255.255.0,10m dhcp-range=lan,192.168.0.5,192.168.0.250,255.255.255.0,10m
dhcp-range=tag:lan0,::1,constructor:lan0,ra-names,12h dhcp-range=tag:lan0,::1,constructor:lan0,ra-names,12h
dhcp-host=dragon,192.168.0.10,12h
dhcp-host=beefcake,192.168.0.9,12h
dhcp-host=chromebox,192.168.0.5,12h
dhcp-host=B-C02G56VXML85,192.168.0.128,12h
dhcp-host=B-W4KNHWJ6XY,192.168.0.217,12h
dhcp-host=mnemonic,192.168.0.248,ea:1b:7a:fb:8b:b8,12h
# dhcp-host=frontdoorcam,192.168.0.89,9c:8e:cd:2b:71:e9,120m
dhcp-host=dragon,10.0.0.10,12h address=/video.lyte.dev/192.168.0.9
dhcp-host=beefcake,10.0.0.9,12h address=/git.lyte.dev/192.168.0.9
dhcp-host=chromebox,10.0.0.5,12h address=/bw.lyte.dev/192.168.0.9
dhcp-host=mnemonic,10.0.0.248,ea:1b:7a:fb:8b:b8,12h address=/files.lyte.dev/192.168.0.9
# dhcp-host=frontdoorcam,10.0.0.89,9c:8e:cd:2b:71:e9,120m address=/vpn.h.lyte.dev/192.168.0.9
address=/.h.lyte.dev/192.168.0.9
address=/video.lyte.dev/10.0.0.9 dhcp-host=AMC058BA_A75F1E,192.168.0.150,12h
address=/git.lyte.dev/10.0.0.9 dhcp-host=AMC0587F_A2969A,192.168.0.151,12h
address=/bw.lyte.dev/10.0.0.9
address=/files.lyte.dev/10.0.0.9
address=/vpn.h.lyte.dev/10.0.0.9
address=/.h.lyte.dev/10.0.0.9
dhcp-host=AMC058BA_A75F1E,10.0.0.150,12h server=192.168.0.1
dhcp-host=AMC0587F_A2969A,10.0.0.151,12h
server=10.0.0.1
server=8.8.8.8 server=8.8.8.8
server=8.8.4.4 server=8.8.4.4
server=1.1.1.1 server=1.1.1.1

View File

@ -8,8 +8,8 @@
ff02::1 ip6-allnodes ff02::1 ip6-allnodes
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
10.0.0.9 git.lyte.dev 192.168.0.9 git.lyte.dev
10.0.0.9 video.lyte.dev 192.168.0.9 video.lyte.dev
10.0.0.9 files.lyte.dev 192.168.0.9 files.lyte.dev
10.0.0.9 bw.lyte.dev 192.168.0.9 bw.lyte.dev
10.0.0.9 vpn.h.lyte.dev 192.168.0.9 vpn.h.lyte.dev

View File

@ -33,6 +33,7 @@ restart-services:
# systemctl restart systemd-resolved # this seems to conflict with dnsmasq - not sure we need it? # systemctl restart systemd-resolved # this seems to conflict with dnsmasq - not sure we need it?
systemctl restart dhcpcd@lan0 systemctl restart dhcpcd@lan0
systemctl restart dhcpcd@wan0 systemctl restart dhcpcd@wan0
systemctl restart radvd
# ksystemctl restart tailscaled # is this necessary since no config lies in this repo? # ksystemctl restart tailscaled # is this necessary since no config lies in this repo?
echo "Services restarted!" echo "Services restarted!"
@ -46,6 +47,7 @@ enable-and-start-services:
# systemctl enable --now systemd-resolved # this seems to conflict with dnsmasq - not sure we need it? # systemctl enable --now systemd-resolved # this seems to conflict with dnsmasq - not sure we need it?
systemctl enable --now dhcpcd@lan0 systemctl enable --now dhcpcd@lan0
systemctl enable --now dhcpcd@wan0 systemctl enable --now dhcpcd@wan0
systemctl enable --now radvd
# systemctl enable --now tailscaled # is this necessary since no config lies in this repo? # systemctl enable --now tailscaled # is this necessary since no config lies in this repo?
echo "Services enabled and restarted!" echo "Services enabled and restarted!"

View File

@ -35,7 +35,7 @@ table ip nat {
set masq_saddr { set masq_saddr {
type ipv4_addr type ipv4_addr
flags interval flags interval
elements = { 10.0.0.0/8 } elements = { 192.168.0.0/16 }
} }
map map_port_ipport { map map_port_ipport {
@ -48,40 +48,40 @@ table ip nat {
fib daddr type local dnat ip addr . port to meta l4proto . th dport map @map_port_ipport fib daddr type local dnat ip addr . port to meta l4proto . th dport map @map_port_ipport
# chromebox # chromebox
iifname $WAN tcp dport { 8008, 8448, 7777 } dnat to 10.0.0.5 iifname $WAN tcp dport { 8008, 8448, 7777 } dnat to 192.168.0.5
iifname $WAN udp dport { 7777 } dnat to 10.0.0.5 iifname $WAN udp dport { 7777 } dnat to 192.168.0.5
iifname $WAN udp dport 60010-60019 dnat to 10.0.0.5 iifname $WAN udp dport 60010-60019 dnat to 192.168.0.5
# old dragon? # old dragon?
# iifname $WAN tcp dport { 2221, 5588, 5589 } dnat to 10.0.0.10 # iifname $WAN tcp dport { 2221, 5588, 5589 } dnat to 192.168.0.10
# iifname $WAN udp dport 60020-60029 dnat to 10.0.0.10 # iifname $WAN udp dport 60020-60029 dnat to 192.168.0.10
iifname $WAN tcp dport { 10578, 5588, 5589 } dnat to 10.0.0.11 iifname $WAN tcp dport { 10578, 5588, 5589 } dnat to 192.168.0.11
iifname $WAN udp dport { 10578 } dnat to 10.0.0.11 iifname $WAN udp dport { 10578 } dnat to 192.168.0.11
# dragon reinstall? # dragon reinstall?
iifname $WAN tcp dport { 2221, 5588, 5589 } dnat to 10.0.0.10 iifname $WAN tcp dport { 2221, 5588, 5589 } dnat to 192.168.0.10
iifname $WAN udp dport { 2221, 5588, 5589 } dnat to 10.0.0.10 iifname $WAN udp dport { 2221, 5588, 5589 } dnat to 192.168.0.10
iifname $WAN udp dport 60020-60029 dnat to 10.0.0.10 iifname $WAN udp dport 60020-60029 dnat to 192.168.0.10
# iifname $WAN udp dport 9876-9877 dnat to 10.0.0.10 # valheim # iifname $WAN udp dport 9876-9877 dnat to 192.168.0.10 # valheim
# beefcake (ben access) # beefcake (ben access)
iifname $WAN tcp dport { 64022 } dnat to 10.0.0.9 iifname $WAN tcp dport { 64022 } dnat to 192.168.0.9
iifname $WAN udp dport { 64020 } dnat to 10.0.0.9 iifname $WAN udp dport { 64020 } dnat to 192.168.0.9
# beefcake services # beefcake services
iifname $WAN tcp dport { 443, 80, 22 } dnat to 10.0.0.9 iifname $WAN tcp dport { 443, 80, 22 } dnat to 192.168.0.9
# mnemonic # mnemonic
iifname $WAN tcp dport { 8022 } dnat to 10.0.0.248 iifname $WAN tcp dport { 8022 } dnat to 192.168.0.248
# ourcraft # ourcraft
iifname $WAN tcp dport { 2456, 2457, 25565, 34197 } dnat to 10.0.0.244 iifname $WAN tcp dport { 2456, 2457, 25565, 34197 } dnat to 192.168.0.244
iifname $WAN udp dport { 2456, 2457, 25565, 34197 } dnat to 10.0.0.244 iifname $WAN udp dport { 2456, 2457, 25565, 34197 } dnat to 192.168.0.244
# router # router
iifname $WAN tcp dport { 2201 } dnat to 10.0.0.1 iifname $WAN tcp dport { 2201 } dnat to 192.168.0.1
iifname $WAN udp dport { 2201 } dnat to 10.0.0.1 iifname $WAN udp dport { 2201 } dnat to 192.168.0.1
} }
chain output { chain output {