4.0 support (#608)

unifi-utilities · May 14, 2024 · e5269cf · fdcastel · May 14, 2024 · e5269cf
1 parent 549af97
commit e5269cf
Show file tree

Hide file tree

Showing 42 changed files with 229 additions and 334 deletions.
diff --git a/att-ipv6/10-att-ipv6.sh b/att-ipv6/10-att-ipv6.sh
@@ -1,22 +1,19 @@
-#! /bin/sh
+#! /bin/bash
 set -eo pipefail
 
 # Get DataDir location
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
 # Check if the directory exists
 if [ ! -d "$DATA_DIR/att-ipv6" ]; then

diff --git a/cloudflare-ddns/on_boot.d/30-cloudflare-ddns.sh b/cloudflare-ddns/on_boot.d/30-cloudflare-ddns.sh
@@ -4,18 +4,15 @@ CONTAINER=cloudflare-ddns
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
 # Check if the directory exists
 if [ ! -d "$DATA_DIR/cloudflare-ddns" ]; then

diff --git a/dns-common/on_boot.d/10-dns.sh b/dns-common/on_boot.d/10-dns.sh
@@ -3,19 +3,16 @@
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
-esac
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
+esac 
 ## configuration variables:
 VLAN=5
 IPV4_IP="10.0.5.3"

diff --git a/haproxy/50-haproxy.sh b/haproxy/50-haproxy.sh
@@ -4,20 +4,16 @@ CONTAINER=haproxy
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/haproxy" ]; then
   # If it does not exist, create the directory

diff --git a/haproxy/update-haproxy.sh b/haproxy/update-haproxy.sh
@@ -3,20 +3,16 @@ IMAGE=haproxy:latest
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
-
 podman pull $IMAGE
 podman stop haproxy
 podman rm haproxy

diff --git a/hdhomerun/on_boot.d/99-hdhomerun.sh b/hdhomerun/on_boot.d/99-hdhomerun.sh
@@ -8,10 +8,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
     DATA_DIR="/mnt/data"
     ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
     DATA_DIR="/data"
     ;;
 *)

diff --git a/homebridge/on_boot.d/25-homebridge.sh b/homebridge/on_boot.d/25-homebridge.sh
@@ -5,20 +5,16 @@ CONTAINER=homebridge
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
-esac
-
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
+esac 
 ## network configuration and startup:
 CNI_PATH=${DATA_DIR}/podman/cni
 # Check if the directory exists

diff --git a/ipt-enable-logs/on_boot.d/30-ipt-enable-logs-launch.sh b/ipt-enable-logs/on_boot.d/30-ipt-enable-logs-launch.sh
@@ -4,20 +4,16 @@
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/scripts" ]; then
   # If it does not exist, create the directory

diff --git a/ipt-enable-logs/scripts/ipt-enable-logs.sh b/ipt-enable-logs/scripts/ipt-enable-logs.sh
@@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
     DATA_DIR="/mnt/data"
     ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
     DATA_DIR="/data"
     ;;
 *)

diff --git a/ipt-enable-logs/scripts/refresh-iptables.sh b/ipt-enable-logs/scripts/refresh-iptables.sh
@@ -3,18 +3,15 @@
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
 
 # Check if the directory exists

diff --git a/modern-unix/on_boot.d/10-shell-profile.sh b/modern-unix/on_boot.d/10-shell-profile.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bssh
 
 ## Configure shell profile
 PROFILE_SOURCE=/data/settings/profile/global.profile.d

diff --git a/modern-unix/settings/profile/global.profile.d/aliases.sh b/modern-unix/settings/profile/global.profile.d/aliases.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 alias ...=../..
 alias ....=../../..

diff --git a/modern-unix/settings/profile/global.profile.d/opt.sh b/modern-unix/settings/profile/global.profile.d/opt.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH="/data/opt:$PATH"
 export PATH
diff --git a/mosquitto/on_boot.d/45-mosquitto.sh b/mosquitto/on_boot.d/45-mosquitto.sh
@@ -3,18 +3,15 @@
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
-  DATA_DIR="/mnt/data"
-  ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-  echo "ERROR: No persistent storage found." 1>&2
-  exit 1
-  ;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
 
 # Check if the directory exists
@@ -36,7 +33,7 @@ CONTAINER_CNI_PATH="${DATA_DIR}/podman/cni/45-mosquitto.conflist"
 # make sure cni plugs are installed
 if ! test -f /opt/cni/bin/macvlan; then
   echo "Error: CNI plugins not found. You can install it with the following command:" >&2
-  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/sh ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
+  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/bash ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
   exit 1
 fi
 

diff --git a/on-boot-script-2.x/Dockerfile b/on-boot-script-2.x/Dockerfile
@@ -1,7 +1,7 @@
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
 
 RUN set -ex \
-    && echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list \
+    && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
 	build-essential \

diff --git a/on-boot-script-2.x/README.md b/on-boot-script-2.x/README.md
@@ -22,7 +22,7 @@
 You can execute in UDM/Pro/SE and UDR with:
 
 ```bash
-curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script-2.x/remote_install.sh" | /bin/sh
+curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script-2.x/remote_install.sh" | /bin/bash
 ```
 
 This is a force to install script so will uninstall any previous version and install on_boot keeping your on boot files.
@@ -37,11 +37,11 @@ This will also install CNI Plugins & CNI Bridge scripts. If you are using UDMSE/
    unifi-os shell
    ```
 
-2. Download [udm-boot-2x_1.0.1_all.deb](packages/udm-boot_1.0.0-2x_all.deb) and install it and go back to the UDM.
+2. Download [udm-boot-2x_1.0.1_all.deb](packages/udm-boot-2x_1.0.1_all.deb) and install it and go back to the UDM.
 
    ```bash
-   curl -L [[https://udm-boot.boostchicken.dev](https://unifi.boostchicken.io/udm-boot-2x_1.0.0_all.deb)](https://unifi.boostchicken.io/udm-boot-2x_1.0.0_all.deb) -o udm-boot-2x_1.0.0_all.deb
-   dpkg -i udm-boot-2x_1.0.0_all.deb
+   curl -L [[https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb](https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb)](https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb) -o udm-boot-2x_1.0.1_all.deb
+   dpkg -i udm-boot-2x_1.0.1_all.deb
    systemctl enable udm-boot
    exit
    ```

diff --git a/on-boot-script-2.x/dpkg-build-files/debian/prerm b/on-boot-script-2.x/dpkg-build-files/debian/prerm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # prerm script for udm-boot
 #
 # see: dh_installdeb(1)

diff --git a/on-boot-script-2.x/examples/udm-files/on_boot.d/10-shell-profile.sh b/on-boot-script-2.x/examples/udm-files/on_boot.d/10-shell-profile.sh
@@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
     DATA_DIR="/mnt/data"
     ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
     DATA_DIR="/data"
     ;;
 *)

diff --git a/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-github-ssh-keys.sh b/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-github-ssh-keys.sh
@@ -1,21 +1,17 @@
 #!/bin/bash
 
 # Get DataDir location
-DATA_DIR="/data"
-case "$(ubnt-device-info firmware || true)" in
+DATA_DIR="/data"case "$(ubnt-device-info firmware || true)" in
 1*)
-	DATA_DIR="/mnt/data"
-	;;
-2*)
-	DATA_DIR="/data"
-	;;
-3*)
-	DATA_DIR="/data"
-	;;
+    DATA_DIR="/mnt/data"
+    ;;
+2* | 3* | 4*)
+    DATA_DIR="/data"
+    ;;
 *)
-	echo "ERROR: No persistent storage found." 1>&2
-	exit 1
-	;;
+    echo "ERROR: No persistent storage found." 1>&2
+    exit 1
+    ;;
 esac
 ## Config Variables - please edit these
 # Set to true to download public keys from a github user account