X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=wrt-setup-local;h=73eaeba8bdd2cc3462dfd5756d446c17e6578fda;hp=2c28dca69bfcf247c25dc52e1d8b74d8ca29b899;hb=HEAD;hpb=92bc3e8554ea8442307a69e59619248dda974926 diff --git a/wrt-setup-local b/wrt-setup-local index 2c28dca..3d2edb8 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -16,13 +16,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -set -eE -o pipefail -trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR - +f=/usr/local/lib/bash-bear;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f usage() { cat <&2; usage 1 ;; esac ;; @@ -103,10 +96,29 @@ while getopts hm:t:yz opt; do done shift "$((OPTIND-1))" # Discard the options and sentinel -- +if [[ $1 ]]; then + h=$1 +elif [[ $hostname ]]; then + h=$hostname +else + h=cmc +fi + +if [[ ! $hostname ]]; then + hostname=$h +fi + + +secrets=false +if [[ -e /root/router-secrets ]]; then + secrets=true + source /root/router-secrets +fi + if [[ ! $mac ]] && ! $test && $secrets; then # if we wanted to increment it #mac=${mac:0: -1}$((${mac: -1} + 2)) - mac=${rwmac[$rmac]} + mac=${rwmac[$h]} fi if (( $# != 0 )); then @@ -208,7 +220,7 @@ cedit() { lan=10.0.0.0 if $test; then lan=10.1.0.0 -elif [[ $hostname == cmc ]]; then +elif [[ $hostname == cmc || $hostname == cmcap ]]; then lan=10.2.0.0 elif $client; then lan=10.3.0.0 @@ -217,14 +229,14 @@ fi if $test; then ssid="gnuv3" elif $secrets; then - ssid=${rssid[$rmac]} + ssid=${rssid[$h]} fi : ${ssid:=librecmc} if $secrets; then - key=${rkey[$rmac]} + key=${rkey[$h]} fi : ${key:=pictionary49} @@ -232,7 +244,8 @@ mask=255.255.0.0 cidr=16 l=${lan%.0} -passwd -l root ||: #already locked fails +# why did we lock this? i don't know +#passwd -l root ||: #already locked fails sed -ibak '/^root:/d' /etc/shadow # /root/router created by manually running passwd then copying the resulting @@ -279,8 +292,8 @@ fi uset network.lan.ipaddr $l.$lanip uset network.lan.netmask $mask -if $dev2 || $client; then - if $dev2; then +if $dev2 || $client || $ap; then + if $dev2 || $ap; then uset network.lan.gateway $l.1 uset network.wan.proto none uset network.wan6.proto none @@ -290,10 +303,16 @@ if $dev2 || $client; then /etc/init.d/odhcpd stop /etc/init.d/odhcpd disable rm -f /etc/resolv.conf - cat >/etc/resolv.conf <<'EOF' + if $ap; then + cat >/etc/resolv.conf </etc/resolv.conf <<'EOF' nameserver 8.8.8.8 nameserver 8.8.4.4 EOF + fi # things i tried to keep dnsmasq running but not enabled except local dns, # but it didnt work right and i dont need it anyways. @@ -307,7 +326,11 @@ EOF else # these are the defaults - uset network.lan.gateway '' + + # this is not needed unless switching from the above condition. + # disabling just to debug + #uset network.lan.gateway '' + uset network.wan.proto dhcp uset network.wan6.proto dhcpv6 /etc/init.d/dnsmasq start @@ -321,13 +344,13 @@ wireless_restart=false if $client; then uset wireless.default_radio0.network 'wwan' - uset wireless.default_radio0.ssid ${rclientssid[$rmac]} + uset wireless.default_radio0.ssid ${rclientssid[$h]} uset wireless.default_radio0.encryption 'psk2' uset wireless.default_radio0.device 'radio0' uset wireless.default_radio0.mode 'sta' - uset wireless.default_radio0.bssid ${rclientbssid[$rmac]} + uset wireless.default_radio0.bssid ${rclientbssid[$h]} # todo: look into whether 5g network is available. - uset wireless.default_radio0.key ${rclientkey[$rmac]} + uset wireless.default_radio0.key ${rclientkey[$h]} uset wireless.radio0.disabled false uset wireless.radio1.disabled true else @@ -341,13 +364,33 @@ else if [[ $mac ]]; then uset wireless.default_radio$x.macaddr $macpre$((macsuf + 2*x)) fi - # secondary device has wireless disabled + # disable/enable. secondary device has wireless disabled uset wireless.radio$x.disabled $dev2 done fi +if grep '^OPENWRT_BOARD="mvebu/cortexa9"' /etc/os-release &>/dev/null; then + # todo, I also enabled irqbalance, didnt script it though + # https://forum.openwrt.org/t/wrt1900acs-wifi-issue-after-upgrade-from-19-07-to-21-02-vacuum-cleaner-legacy-rate-support/113311/28 + cat >/etc/rc.local <<'EOF' +echo "0" >> /sys/kernel/debug/ieee80211/phy0/mwlwifi/tx_amsdu +echo "0" >> /sys/kernel/debug/ieee80211/phy1/mwlwifi/tx_amsdu +exit 0 +EOF + chmod +x /etc/rc.local + /etc/rc.local + uset wireless.radio0.disassoc_low_ack 0 + uset wireless.radio1.disassoc_low_ack 0 +fi +# found with https://openwrt.org/docs/guide-user/network/wifi/iwchan. +# However, the default also chooses 11, and better to let it choose in case things change. +# case $HOSTNAME in +# cmc) +# uset wireless.radio0.channel 11 +# ;; +# esac # usb, screen, relay are for libremanage @@ -355,10 +398,33 @@ fi # # relay package temporarily disabled # /root/relay_1.0-1_mips_24kc.ipk -v pi kmod-usb-storage block-mount kmod-fs-ext4 nfs-kernel-server \ - tcpdump openvpn-openssl adblock libusb-compat \ - screen kmod-usb-serial-cp210x kmod-usb-serial-ftdi rsync\ - unbound-daemon-heavy unbound-checkconf +# +# note: prometheus-node-exporter-lua-openwrt seems to be a dependency of +# prometheus-node-exporter-lua in practice. + +pkgs=( + tcpdump + screen + rsync + kmod-usb-storage + block-mount + kmod-fs-ext4 + prometheus-node-exporter-lua-openwrt + prometheus-node-exporter-lua +) + +if ! $ap; then + pkgs+=( + unbound-daemon + unbound-checkconf + ) +fi + +v pi "${pkgs[@]}" +# nfs-kernel-server \ + # openvpn-openssl adblock libusb-compat \ + # kmod-usb-serial-cp210x kmod-usb-serial-ftdi \ + cat >/etc/libremanage.conf </dev/null; then # # cant mix cedit plus uci @@ -811,26 +933,9 @@ firewall-cedit || firewall_restart=true -cedit /etc/hosts <&2 - exit 1 + if $unbound_restart; then + /etc/init.d/unbound restart + if ! unbound-checkconf; then + echo $0: error: unbound-checkconf failed >&2 + exit 1 + fi fi -fi - - -# 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 -# https://github.com/openwrt/packages/tree/master/net/adblock/files -cat >/etc/crontabs/root <<'EOF' -0 06 * * * /etc/init.d/adblock reload -EOF +fi # end if $ap + +# # 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 +# # https://github.com/openwrt/packages/tree/master/net/adblock/files +# cat >/etc/crontabs/root <<'EOF' +# 0 06 * * * /etc/init.d/adblock reload +# EOF # useful: http://wiki.openwrt.org/doc/howto/dhcp.dnsmasq @@ -988,11 +1104,15 @@ EOF # to start. mkdir -p /mnt/usb/tftpboot cedit /etc/dnsmasq.conf <