bs.sh

Author: ipitio

README.md

@@ -63,17 +63,16 @@ Keep in mind that:
 
 ### Deployment
 
-Create a node in two or three steps (or update in one). The initial reboot, as well as those after upgrading, may take a while as everything is set up, but the subsequent ones will be much faster. For example, the SaaH peer will be created on a HaaS if it doesn't exist. This means that you should set a Hub or HaaS up first, so SaaH and Spoke peer configurations can be generated. Drop those in their `wireguard/config/wg_confs` directories before rebooting. This [AllowedIPs Calculator](https://www.procustodibus.com/blog/2021/03/wireguard-allowedips-calculator) is pretty nifty, if you need it.
+Create a node in no more than four steps (probably three or two) (or update in one). The initial reboot, as well as those after upgrading, may take a while as everything is set up, but the subsequent ones will be much faster. For example, the SaaH peer will be created on a HaaS if it doesn't exist. This means that you should set a Hub or HaaS up first, so SaaH and Spoke peer configurations can be generated. Drop those in their `wireguard/config/wg_confs` directories before rebooting. This [AllowedIPs Calculator](https://www.procustodibus.com/blog/2021/03/wireguard-allowedips-calculator) is pretty nifty, if you need it.
 
+0. If you have an existing configuration, you can copy it to `/opt/closure` now.
 1. Install or update the package by either:
     - pasting the one-liner or block below;
     - downloading it from [Releases](https://github.com/ipitio/closure/releases); or
     - copying this repo to `/opt/closure`.
 
-If you're installing on top of an existing configuration with one of the first two options, or updating by running `sudo apt upgrade -y closure`, `rc.local` will be copied for you; skip step 2 and reboot after this step.
-
 ```{bash}
-curl -sSLNZ https://ipitio.github.io/closure/i | sudo bash
+wget -qO- https://ipitio.github.io/closure/i | sudo bash
 ```
 
 ```{bash}
@@ -88,7 +87,7 @@ sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq closure
 ```
 
-2. Edit the files above, copy `rc.local` to `/etc`, and reboot.
+2. Edit the files above if you skipped step 0, copy `rc.local` to `/etc` if you copied the repo in the previous step, and reboot.
 3. On a Hub or HaaS, add Spokes you didn't define yet by running `add.sh` as described below.
 
 > [!NOTE]

bs.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if grep -q Raspberry /proc/device-tree/model; then
+
+    # wifi 2.4GHz performance
+    grep -q dtoverlay=disable-bt /boot/firmware/config.txt || echo "dtoverlay=disable-bt" | sudo tee -a /boot/firmware/config.txt >/dev/null
+
+    if [ ! -f /etc/modprobe.d/brcmfmac.conf ]; then
+        # wifi chip bug: https://github.com/raspberrypi/linux/issues/6049#issuecomment-2642566713
+        echo "options brcmfmac roamoff=1 feature_disable=0x202000" | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
+        sudo systemctl restart systemd-modules-load
+    fi
+fi
+
+# Verbose boot
+if [ -f /etc/default/grub ] && grep -q "quiet splash" /etc/default/grub; then
+    sudo sed -i 's/quiet splash//g' /etc/default/grub
+    sudo update-grub
+fi

debian/control

@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.6.26
+Version: 1.6.27
 Maintainer: ipitio <21136719+ipitio@users.noreply.github.com>
 Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
 Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

debian/postinst

@@ -1,7 +1,9 @@
 #!/bin/bash
-# shellcheck disable=SC1003
+# shellcheck disable=SC1003,SC1091
 
 pushd /opt/closure || exit 1
-[ ! -f env.sh ] || cp rc.local /etc/rc.local
-[ ! -f /opt/closure/installed ] || rm -rf /opt/closure/installed
+[[ ! -f /etc/rc.local || -f /etc/rc.local.bak ]] || sudo mv -f /etc/rc.local /etc/rc.local.bak
+cp rc.local /etc/rc.local
+[ ! -f installed ] || rm -rf installed
+source "bs.sh"
 popd || exit 1

init.sh

@@ -71,15 +71,6 @@ yq -V | grep -q mikefarah &>/dev/null || {
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak install --noninteractive flathub tv.kodi.Kodi
 [ ! -f /.dockerenv ] || exit 0
-source "lib.sh"
-
-# general performance
-# https://cromwell-intl.com/open-source/performance-tuning/tcp.html
-while IFS= read -r line; do
-    grep -qP "^#?\s*?$(echo "$line" | cut -d= -f1)\s*?=.*$" /etc/sysctl.conf && sudo sed -r -i "s/^#?\s*?$(echo "$line" | cut -d= -f1)\s*?=.*$/$line/g" /etc/sysctl.conf || echo "$line" | sudo tee -a /etc/sysctl.conf >/dev/null
-done <sysctl.conf
-grep -E '(#|.+=)' /etc/sysctl.conf | awk '!seen[$0]++' | sudo tee /etc/sysctl.conf >/dev/null
-sudo sysctl -p
 
 # wifi performance
 echo "[connection]
@@ -88,24 +79,16 @@ wifi.powersave = 2
 " | sudo tee /etc/NetworkManager/conf.d/wifi-powersave.conf >/dev/null
 sudo cp -f /etc/NetworkManager/conf.d/wifi-powersave.conf /etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
 [ ! -f /lib/NetworkManager/conf.d/20-connectivity-ubuntu.conf ] || sudo sed -i "s/uri=.*$/uri=/" /lib/NetworkManager/conf.d/20-connectivity-ubuntu.conf
+source "bs.sh"
+source "lib.sh"
 
-if grep -q Raspberry /proc/device-tree/model; then
-
-    # wifi 2.4GHz performance
-    grep -q dtoverlay=disable-bt /boot/firmware/config.txt || echo "dtoverlay=disable-bt" | sudo tee -a /boot/firmware/config.txt >/dev/null
-
-    if [ ! -f /etc/modprobe.d/brcmfmac.conf ]; then
-        # wifi chip bug: https://github.com/raspberrypi/linux/issues/6049#issuecomment-2642566713
-        echo "options brcmfmac roamoff=1 feature_disable=0x202000" | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
-        sudo systemctl restart systemd-modules-load
-    fi
-fi
-
-# Verbose boot
-if [ -f /etc/default/grub ] && grep -q "quiet splash" /etc/default/grub; then
-    sudo sed -i 's/quiet splash//g' /etc/default/grub
-    sudo update-grub
-fi
+# general performance
+# https://cromwell-intl.com/open-source/performance-tuning/tcp.html
+while IFS= read -r line; do
+    grep -qP "^#?\s*?$(echo "$line" | cut -d= -f1)\s*?=.*$" /etc/sysctl.conf && sudo sed -r -i "s/^#?\s*?$(echo "$line" | cut -d= -f1)\s*?=.*$/$line/g" /etc/sysctl.conf || echo "$line" | sudo tee -a /etc/sysctl.conf >/dev/null
+done <sysctl.conf
+grep -E '(#|.+=)' /etc/sysctl.conf | awk '!seen[$0]++' | sudo tee /etc/sysctl.conf >/dev/null
+sudo sysctl -p
 
 # Ensure users exist
 for user in $CLS_ACTIVE_USER $CLS_SCRIPT_USER; do