X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup-local;h=ce6ad036e46ccaffbc289b94f9f1dd6a9933af53;hb=137ffae7de84a51c4b438ccf2fb50f5571f522a6;hp=a1f1ee34bc1d3d4498bbea3f072c4c7b32ee71e4;hpb=bd3227e34e549257fee819cf6bd50fe202ca7996;p=automated-distro-installer

diff --git a/wrt-setup-local b/wrt-setup-local
index a1f1ee3..ce6ad03 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -750,11 +750,11 @@ config rule
 
 
 config redirect
- option name httpkd
+ option name http
  option src              wan
  option src_dport        80
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -763,11 +763,11 @@ config rule
  option proto            tcp
 
 config redirect
- option name httpskd
+ option name https
  option src              wan
  option src_dport        443
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -992,6 +992,8 @@ local-data-ptr: "10.173.8.2 nn.b8.nz"
 
 forward-zone:
   name: "."
+#  forward-addr: 8.8.8.8
+#  forward-addr: 8.8.8.8
 # https://developers.cloudflare.com/1.1.1.1/1.1.1.1-for-families/setup-instructions/dns-over-https
   forward-addr: 1.1.1.3@853#family.cloudflare-dns.com
   forward-addr: 1.0.0.3@853#family.cloudflare-dns.com
@@ -1058,8 +1060,13 @@ rebind-domain-ok=b8.nz
 # It is default if dnsmasq is doing dns, otherwise, we have to specify it.
 # To see it in action, I ran this from a client machine:
 # sudo dhcpcd -o domain_name_servers -T
-dhcp-option=6,$l.1
+dhcp-option=option:dns-server,$l.1
 
+# use this when doing fai to get the right timezone, its nfsroot is
+# setup to use this dhcp option only and call ntpdate.
+# generate ips with:
+# for h in 0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org ntp.ubuntu.com; do host -t a $h | awk '{print $NF}'; done | while read -r l; do printf ,$l; done
+dhcp-option=option:ntp-server,188.165.3.28,202.12.97.45,91.236.251.13,50.205.244.23,78.30.254.80,31.131.0.123,202.65.114.202,94.228.220.14,185.125.190.57,185.125.190.58,91.189.91.157,185.125.190.56,91.189.94.4
 
 
 # results from googling around dnsmasq optimizations
@@ -1118,6 +1125,8 @@ dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy
 # 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.12,demohost
+## for using different dhcp server
+#dhcp-host=52:54:00:9c:ef:ad,ignore
 dhcp-host=62:03:cb:a8:3e:a3,set:trp,$1.13,trp
 # 14 = wrt3
 dhcp-host=00:1f:16:14:01:d8,set:x3,$l.18,x3
@@ -1134,12 +1143,12 @@ dhcp-host=0a:8a:9b:cf:b5:ec,set:samsungtab,$l.32,samsungtab
 dhcp-host=b8:27:eb:78:21:1d,set:pi3b,$l.33,pi3b
 dhcp-host=e4:5f:01:07:50:3f,set:pi4,$l.38,pi4
 dhcp-host=e4:5f:01:07:50:40,set:pi4w,$l.39,pi4w
-#dhcp-host=,set:pi4,$l.33,pi4
-
+# server d16:
+dhcp-host=38:2c:4a:c9:33:13,set:bigs,$l.48,bigs
 
 
 # faiserver vm
-dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
+#dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
 
 # This is the ip it picks by default if dhcp fails,
 # so might as well use it.