iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change partitioning to use lvm, refactor for fsf server
[automated-distro-installer]
/
wrt-setup-local
diff --git
a/wrt-setup-local
b/wrt-setup-local
index c4308005d591186f0064e6697c7414761c9dd2ab..7efa19a66fb7d3bc4eeed3ee21155df03d9e86e6 100755
(executable)
--- 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
#
# 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 \
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 \
# 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
# 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
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
config redirect
option name sshkd
option src wan
@@
-722,11
+750,11
@@
config rule
config redirect
config redirect
- option name http
kd
+ option name http
option src wan
option src_dport 80
option dest lan
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
option proto tcp
config rule
option src wan
@@
-735,11
+763,11
@@
config rule
option proto tcp
config redirect
option proto tcp
config redirect
- option name https
kd
+ option name https
option src wan
option src_dport 443
option dest lan
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
option proto tcp
config rule
option src wan
@@
-964,6
+992,8
@@
local-data-ptr: "10.173.8.2 nn.b8.nz"
forward-zone:
name: "."
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
# 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
@@
-1090,6
+1120,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
# 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
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
@@
-1103,11
+1135,14
@@
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=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
+#dhcp-host=,set:pi4,$l.33,pi4
# faiserver vm
# 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.
# This is the ip it picks by default if dhcp fails,
# so might as well use it.
@@
-1117,12
+1152,16
@@
dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca
# template
# dhcp-host=,$l.,
# 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
#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
#log-queries=extra
EOF