From b8c3bb3438b1f11674bc9603afc14ebb48847ca4 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 18 Jan 2026 14:43:55 +0100 Subject: [PATCH] Update unif & omada --- src/functions.sh | 18 +++++++++++++++++- src/omada/constants-service.conf | 2 +- src/omada/install-service.sh | 15 ++++++--------- src/unifi/constants-service.conf | 2 +- src/unifi/install-service.sh | 14 ++++++++------ 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index 77dd007..510bdbd 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -115,5 +115,21 @@ inst_45drives() { inst_docker() { apt_repo "docker" "https://download.docker.com/linux/debian/gpg" "https://download.docker.com/linux/debian" "$(lsb_release -cs)" stable apt update - DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y -qq docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin pwgen + DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin pwgen } +#### Set repo and install MongoDB #### +inst_mongodb() { + MONGODB_VERSION=${1:-8.0} + + apt_repo "mongodb" "https://www.mongodb.org/static/pgp/server-$MONGODB_VERSION.asc" "http://repo.mongodb.org/apt/debian" "bookworm/mongodb-org/$MONGODB_VERSION" "main" + apt update + DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq mongodb-org +} + +#### Set repo and install MongoDB #### +inst_bashclub() { + BASHCLUB_COMPONENT=${1:-release} + + apt_repo "bashclub" "https://apt.bashclub.org/gpg/bashclub.pub" "https://apt.bashclub.org/$BASHCLUB_COMPONENT" "$(lsb_release -cs)" "main" + apt update +} \ No newline at end of file diff --git a/src/omada/constants-service.conf b/src/omada/constants-service.conf index 5194b1f..f6ed68e 100644 --- a/src/omada/constants-service.conf +++ b/src/omada/constants-service.conf @@ -8,7 +8,7 @@ # This file contains the project constants on service level # Debian Version, which will be installed -LXC_TEMPLATE_VERSION="debian-12-standard" +LXC_TEMPLATE_VERSION="debian-13-standard" # Create sharefs mountpoint LXC_MP=0 diff --git a/src/omada/install-service.sh b/src/omada/install-service.sh index 5692314..e3c0d65 100644 --- a/src/omada/install-service.sh +++ b/src/omada/install-service.sh @@ -10,14 +10,11 @@ set -euo pipefail source /root/functions.sh source /root/zamba.conf source /root/constants-service.conf -# wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium-keyring.gpg -wget -O - https://apt.bashclub.org/gpg/bashclub.pub | gpg --dearmor > /usr/share/keyrings/bashclub-keyring.gpg -wget -O - https://pgp.mongodb.com/server-7.0.asc | gpg --dearmor > /usr/share/keyrings/mongodb-server-7.0.gpg -echo "deb [signed-by=/usr/share/keyrings/bashclub-keyring.gpg] https://apt.bashclub.org/omada $(lsb_release -cs 2>/dev/null) main" > /etc/apt/sources.list.d/bashclub-omada.list -# echo "deb [signed-by=/usr/share/keyrings/adoptium-keyring.gpg] https://packages.adoptium.net/artifactory/deb $(lsb_release -cs 2>/dev/null) main" > /etc/apt/sources.list.d/adoptium.list -echo "deb [signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" > /etc/apt/sources.list.d/mongodb-org-7.0.list -apt update +inst_mongodb -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install --no-install-recommends -y -qq default-jre-headless jsvc mongodb-org -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install --no-install-recommends -y -qq omadac +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install --no-install-recommends -y -qq default-jre-headless jsvc + +inst_bashclub omada + +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install --no-install-recommends -y -qq omadac \ No newline at end of file diff --git a/src/unifi/constants-service.conf b/src/unifi/constants-service.conf index 09898b2..83c6c31 100644 --- a/src/unifi/constants-service.conf +++ b/src/unifi/constants-service.conf @@ -8,7 +8,7 @@ # This file contains the project constants on service level # Debian Version, which will be installed -LXC_TEMPLATE_VERSION="debian-12-standard" +LXC_TEMPLATE_VERSION="debian-13-standard" # Create sharefs mountpoint LXC_MP=0 diff --git a/src/unifi/install-service.sh b/src/unifi/install-service.sh index 753fa77..595483d 100644 --- a/src/unifi/install-service.sh +++ b/src/unifi/install-service.sh @@ -11,12 +11,14 @@ source /root/functions.sh source /root/zamba.conf source /root/constants-service.conf -wget -O - https://www.mongodb.org/static/pgp/server-7.0.asc | gpg --dearmor > /usr/share/keyrings/mongodb-server-7.0.gpg -wget -O - https://dl.ubnt.com/unifi/unifi-repo.gpg | gpg --dearmor > /usr/share/keyrings/unifi.gpg +inst_unifi() { + apt_repo "unifi" "https://dl.ubnt.com/unifi/unifi-repo.gpg" "http://www.ui.com/downloads/unifi/debian" "stable" "ubiquiti" + apt update + DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends unifi +} -echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list -echo "deb [ signed-by=/usr/share/keyrings/unifi.gpg ] http://www.ui.com/downloads/unifi/debian stable ubiquiti" > /etc/apt/sources.list.d/unifi.list +inst_mongodb -apt update +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq default-jre-headless -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq default-jre-headless unifi \ No newline at end of file +inst_unifi \ No newline at end of file