minor fixes and dns

[automated-distro-installer] / wrt-setup-local

diff --git a/wrt-setup-local b/wrt-setup-local
index 18b4b910131137c6fc38ab757b60bfe7ac001994..567a4a78e67b67334a8f7f7f541f7beee125f630 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -653,8 +653,9 @@ fi
 
 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
@@ -670,12 +671,15 @@ case $hostname in
 $l.1 $hostname t.b8.nz
 $l.3 frodo
 $l.4 wrt2
+$l.5 x2 faiserver
+$l.6 x2w
 EOF
     v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
 server=/b8.nz/#
 
 server=/kd.b8.nz/#
 server=/x2.b8.nz/#
+server=/x2w.b8.nz/#
 server=/tp.b8.nz/#
 server=/bb8.b8.nz/#
 server=/wrt3.b8.nz/#
@@ -686,14 +690,12 @@ EOF
     v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
 $l.1 $hostname b8.nz
 $l.2 kd
-$l.5 x2 faiserver
 $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/#
@@ -711,9 +713,15 @@ 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.
+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
@@ -781,17 +789,19 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 # 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=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
 
 # faiserver vm
 dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
@@ -809,6 +819,8 @@ dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca
 enable-tftp=br-lan
 tftp-root=/mnt/usb/tftpboot
 dhcp-optsfile=/etc/dnsmasq-dhcpopts.conf
+
+#log-queries=extra
 EOF