option src wan
option src_dport 2202
option dest_port 22
- option dest_ip $l.8
+ option dest_ip $l.2
option dest lan
config rule
option src wan
option target ACCEPT
option dest_port 2208
+config redirect
+ option name icecast
+ option src wan
+ option src_dport 8000
+ option dest_port 8000
+ option dest_ip $l.2
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 8000
config rule
option name sshwrt
option src wan
option src_dport 80
option dest lan
- option dest_ip $l.8
+ option dest_ip $l.2
option proto tcp
config rule
option src wan
option src wan
option src_dport 443
option dest lan
- option dest_ip $l.8
+ option dest_ip $l.2
option proto tcp
config rule
option src wan
v cedit /etc/hosts <<EOF || dnsmasq_restart=true
127.0.1.1 $hostname
-$l.6 demohost
#$l.7 x3
+$l.12 demohost
+$l.13 trp
72.14.176.105 li
2600:3c00::f03c:91ff:fe6d:baf8 li
-85.119.83.50 bk
-2001:ba8:1f1:f0c9::2 bk
# netns creation looks for next free subnet starting at 10.173, but I only
# use one, and I would keep this one as the first created.
10.173.0.2 transmission
EOF
case $hostname in
- wrt)
- v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
-$l.1 $hostname t.b8.nz
-$l.3 frodo
-$l.4 wrt2
-EOF
- v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
-server=/b8.nz/#
-
-server=/kd.b8.nz/#
-server=/x2.b8.nz/#
-server=/tp.b8.nz/#
-server=/bb8.b8.nz/#
-server=/wrt3.b8.nz/#
-EOF
- ;;
-
cmc)
v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
-$l.1 $hostname b8.nz
-$l.2 kd
+$l.1 $hostname
+$l.2 kd b8.nz
+#$l.3 frodo
+$l.4 wrt2
$l.5 x2 faiserver
+$l.6 x2w
+$l.7 rp
$l.8 tp
$l.9 bb8
$l.14 wrt3
-EOF
- v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
-server=/t.b8.nz/#
-
-server=/frodo.b8.nz/#
-server=/wrt.b8.nz/#
-server=/wrt2.b8.nz/#
+#$l.18 x3
+$l.19 brother
+#$l.28 frodow
EOF
;;
esac
uset dhcp.@dnsmasq[0].domain b8.nz
uset dhcp.@dnsmasq[0].local /b8.nz/
uset system.@system[0].hostname $hostname
-
-if [[ $(uci get adblock.global.adb_enabled) != 1 ]]; then
- v uci set adblock.global.adb_enabled=1
+# uci doesnt seem to have a way to set an empty value,
+# if you delete it, it goes back to the default. this seems
+# to be a decent workaround.
+# todo: setup /etc/resolv.conf to point to 127.0.0.1
+uset dhcp.@dnsmasq[0].resolvfile=/dev/null
+
+# disabled for now. i want to selectively enable it
+# for specific hosts.
+if [[ $(uci get adblock.global.adb_enabled) != 0 ]]; then
+ v uci set adblock.global.adb_enabled=0
uci commit adblock
/etc/init.d/adblock restart
fi
server=/_dmarc.b8.nz/#
server=/ns1.b8.nz/#
server=/ns2.b8.nz/#
+server=/bk.b8.nz/#
+server=/je.b8.nz/#
mx-host=b8.nz,mail.iankelling.org,10
txt-record=b8.nz,"v=spf1 a ?all"
# top port, iPXE (PCI 04:00.0) in seabios boot menu
#dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
-# 4 is reserved for a staticly configured host.
+# 4 is reserved for a staticly configured host wrt2
# old x2 with bad fan
#dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2
+dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w
# This is so fai can have an explicit name to use for testing,
# or else any random machine which did a pxe boot would get
# reformatted. The mac is from doing a virt-install, cancelling it,
# and copying the generated mac, so it should be randomish.
-dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.6,demohost
-dhcp-host=00:1f:16:14:01:d8,set:tp,$l.7,x3
+dhcp-host=fa:08:f8:4c:14:1c,set:tp,$l.7,rp
dhcp-host=80:fa:5b:1c:6e:cf,set:tp,$l.8,tp
+dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.12,demohost
+dhcp-host=62:03:cb:a8:3e:a3,set:trp,$1.13,trp
+dhcp-host=00:1f:16:14:01:d8,set:tp,$l.18,x3
+# BRN001BA98CA823 in dhcp logs
+dhcp-host=00:1b:a9:8c:a8:23,set:tp,$l.19,brother
+dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
+
# faiserver vm
dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
enable-tftp=br-lan
tftp-root=/mnt/usb/tftpboot
dhcp-optsfile=/etc/dnsmasq-dhcpopts.conf
+
+#log-queries=extra
EOF