X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup-local;h=ce6ad036e46ccaffbc289b94f9f1dd6a9933af53;hb=137ffae7de84a51c4b438ccf2fb50f5571f522a6;hp=92056976da74d45033accbb7518a8db13b2545c8;hpb=c59144a600fd661d9512d8a5005aa0f5bc29bf0d;p=automated-distro-installer diff --git a/wrt-setup-local b/wrt-setup-local index 9205697..ce6ad03 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -379,8 +379,13 @@ esac # # relay package temporarily disabled # /root/relay_1.0-1_mips_24kc.ipk +# +# note: prometheus-node-exporter-lua-openwrt seems to be a dependency of +# prometheus-node-exporter-lua in practice. v pi tcpdump screen rsync unbound-daemon unbound-checkconf \ - kmod-usb-storage block-mount kmod-fs-ext4 + kmod-usb-storage block-mount kmod-fs-ext4 \ + prometheus-node-exporter-lua-openwrt \ + prometheus-node-exporter-lua # nfs-kernel-server \ # openvpn-openssl adblock libusb-compat \ # kmod-usb-serial-cp210x kmod-usb-serial-ftdi \ @@ -458,7 +463,17 @@ EOF # v /etc/init.d/nfsd enable +cedit /etc/config/prometheus-node-exporter-lua <<'EOF' || /etc/init.d/prometheus-node-exporter-lua restart +config prometheus-node-exporter-lua 'main' + option listen_ipv6 '0' + option listen_interface 'lan' + option listen_port '9100 +EOF +# default, as of this writing is: +# config prometheus-node-exporter-lua 'main' +# option listen_interface 'loopback' +# option listen_port '9100' @@ -621,6 +636,19 @@ config rule option target ACCEPT option dest_port 22 +config redirect + option name promkd + option src wan + option src_dport 9091 + option dest_port 9091 + option dest_ip $l.2 + option dest lan +config rule + option src wan + option target ACCEPT + option dest_port 9091 + + config redirect option name sshkd option src wan @@ -722,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 @@ -735,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 @@ -922,9 +950,13 @@ EOF if $zblock; then cat <<'EOF' -# syw, samsungtab # no sy until that dongle is used by ziva -access-control-view: 10.2.0.7/32 "youtube" + +# syw +#access-control-view: 10.2.0.7/32 "youtube" +# bow +access-control-view: 10.2.0.29/32 "youtube" +# samsungtab access-control-view: 10.2.0.32/32 "youtube" EOF fi @@ -960,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 @@ -1026,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 @@ -1079,13 +1118,15 @@ dhcp-host=94:05:bb:1e:2c:2e,set:sy,$l.3,sy #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=70:a6:cc:34:09:22,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=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 @@ -1099,11 +1140,15 @@ dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow dhcp-host=70:a6:cc:3a:bb:b4,set:bow,$l.29,bow dhcp-host=6c:56:97:88:7b:74,set:amazontab,$l.31,amazontab 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 +# 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. @@ -1113,12 +1158,16 @@ dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca # template # dhcp-host=,$l., -# uncomment to do tftpboot. openwrt snapshot from 2022-01, seems like it cant -# access /mnt/usb/tftpboot due to some jail or sandbox thing +# pxe tftpboot for arch-like. todo: openwrt snapshot from 2022-01, it cant +# access /mnt/usb/tftpboot due to ujail sandbox #enable-tftp=br-lan #tftp-root=/mnt/usb/tftpboot -#dhcp-optsfile=/etc/dnsmasq-dhcpopts.conf +#tftp-root=/var/run/dnsmasq/tftpboot + + +dhcp-optsfile=/var/run/dnsmasq/dhcpopts.conf +# for debugging dhcp #log-queries=extra EOF