X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup-local;h=4dbdc0456085a099a7f2cbcce38520c356811a05;hb=61c3a58fcfadab7c333487f887b3f9f3a53bb93a;hp=fcab6e5a265920b0c8fe159681df978b5ef2d3a3;hpb=21353fd35096ba6786c1bae3046b763bfeac5890;p=automated-distro-installer

diff --git a/wrt-setup-local b/wrt-setup-local
index fcab6e5..4dbdc04 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -720,6 +720,15 @@ case $hostname in
   cmc)
     v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
 $l.1 $hostname
+# 127.0.0.1 www.youtube.com
+# 127.0.0.1 googlevideo.com
+# 127.0.0.1 youtu.be
+# 127.0.0.1 youtube-nocookie.com
+# 127.0.0.1 youtube.com
+# 127.0.0.1 youtube.googleapis.com
+# 127.0.0.1 youtubei.googleapis.com
+# 127.0.0.1 ytimg.com
+# 127.0.0.1 ytimg.l.google.com
 EOF
     ;;
 esac
@@ -764,15 +773,17 @@ v cedit /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
 server=/b8.nz/#
 ptr-record=1.0.2.10.in-addr.arpa.,cmc.b8.nz
 ptr-record=2.0.2.10.in-addr.arpa.,kd.b8.nz
+ptr-record=3.0.2.10.in-addr.arpa.,sy.b8.nz
 ptr-record=4.0.2.10.in-addr.arpa.,wrt2.b8.nz
 ptr-record=5.0.2.10.in-addr.arpa.,x2.b8.nz
 ptr-record=6.0.2.10.in-addr.arpa.,xw2.b8.nz
-ptr-record=7.0.2.10.in-addr.arpa.,rp.b8.nz
-ptr-record=8.0.2.10.in-addr.arpa.,tp.b8.nz
+ptr-record=7.0.2.10.in-addr.arpa.,syw.b8.nz
+ptr-record=8.0.2.10.in-addr.arpa.,amy.b8.nz
 ptr-record=9.0.2.10.in-addr.arpa.,bb8.b8.nz
 ptr-record=12.0.2.10.in-addr.arpa.,demohost.b8.nz
 ptr-record=14.0.2.10.in-addr.arpa.,wrt3.b8.nz
 ptr-record=19.0.2.10.in-addr.arpa.,brother.b8.nz
+ptr-record=23.0.2.10.in-addr.arpa.,amyw.b8.nz
 ptr-record=25.0.2.10.in-addr.arpa.,hp.b8.nz
 ptr-record=.0.2.10.in-addr.arpa.,transmission.b8.nz
 
@@ -804,10 +815,15 @@ all-servers
 # download namebench and run it like this:
 # for x in all regional isp global preferred nearby; do ./namebench.py -s \$x -c US -i firefox -m weighted -J 10 -w; echo \$x; hr;  done
 # google
-server=8.8.4.4
-server=8.8.8.8
-server=2001:4860:4860::8888
-server=2001:4860:4860::8844
+server=1.1.1.3
+server=1.0.0.3
+server=2606:4700:4700::1113
+server=2606:4700:4700::1003
+
+# server=8.8.4.4
+# server=8.8.8.8
+# server=2001:4860:4860::8888
+# server=2001:4860:4860::8844
 
 
 # to fixup existin ips, on the client you can do
@@ -816,26 +832,28 @@ server=2001:4860:4860::8844
 # default dhcp range is 100-150
 # bottom port,  iPXE (PCI 03:00.0) in seabios boot menu
 dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
+dhcp-host=94:05:bb:1e:2c:2e,set:sy,$l.3,sy
 # 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 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
+dhcp-host=34:7d:f6:ed:ec:07,set:syw,$l.7,syw
+dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy
 # 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=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
+dhcp-host=00:1f:16:14:01:d8,set:x3,$l.18,x3
 # BRN001BA98CA823 in dhcp logs
-dhcp-host=00:1b:a9:8c:a8:23,set:tp,$l.19,brother
-dhcp-host=38:63:bb:07:5a:f9,set:tp,$l.25,hp
+dhcp-host=00:1b:a9:8c:a8:23,set:brother,$l.19,brother
+
+dhcp-host=00:26:b6:f7:d4:d8,set:amyw,$l.23,amyw
+dhcp-host=38:63:bb:07:5a:f9,set:hp,$l.25,hp
 dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
 
 
@@ -869,7 +887,7 @@ if $dnsmasq_restart && ! $dev2; then
   # todo: according to this
   # https://www.redpill-linpro.com/techblog/2019/08/27/evaluating-local-dnssec-validators.html#toggling-dnssec-validation-1
   # we should turn on dnssec validation when wrt gets version > 2.80. currently at 2.80.
-  # todo: download https://downloads.openwrt.org/snapshots/packages/mipsel_24kc/base/dnsmasq_2.84~~test3-1_mipsel_24kc.ipk
+  # todo: download https://downloads.openwrt.org/snapshots/packages/mipsel_24kc/base/dnsmasq-full_2.84-1_mipsel_24kc.ipk
   # and install it. then we can turn off dnssec in systemd-resolved
   #
   # Also, reload of dnsmasq seems to break things, wifi