Merge branch 'main' into cassandra

install/alpine-zigbee2mqtt-install.sh

@@ -23,7 +23,13 @@ msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt
+mkdir -p /root/.z2m
+ln -s /etc/zigbee2mqtt/ /root/.z2m
+chown -R root:root /etc/zigbee2mqtt /root/.z2m
+sed -i -e 's/#datadir="\/var\/lib\/zigbee2mqtt"/datadir="\/etc\/zigbee2mqtt"/' -e 's/#command_user="zigbee2mqtt"/command_user="root"/' /etc/conf.d/zigbee2mqtt
+$STD rc-update add zigbee2mqtt
+$STD rc-service zigbee2mqtt restart
 msg_ok "Installed Alpine-Zigbee2MQTT"
 
 motd_ssh
-customize
+customize

install/apt-cacher-ng-install.sh

@@ -21,7 +21,7 @@ msg_ok "Installed Dependencies"
 
 msg_info "Installing Apt-Cacher NG"
 DEBIAN_FRONTEND=noninteractive $STD apt-get -o Dpkg::Options::="--force-confold" install -y apt-cacher-ng
-sed -i 's/# PassThroughPattern: .* # this would allow CONNECT to everything/PassThroughPattern: .* /' /etc/apt-cacher-ng/acng.conf
+sed -i 's/# PassThroughPattern: .* # this would allow CONNECT to everything/PassThroughPattern: .*/' /etc/apt-cacher-ng/acng.conf
 systemctl enable -q --now apt-cacher-ng
 msg_ok "Installed Apt-Cacher NG"
 

install/hyperhdr-install.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y gpg
+msg_ok "Installed Dependencies"
+
+msg_info "Installing HyperHDR"
+curl -fsSL https://awawa-dev.github.io/hyperhdr.public.apt.gpg.key >/usr/share/keyrings/hyperhdr.public.apt.gpg.key
+chmod go+r /usr/share/keyrings/hyperhdr.public.apt.gpg.key
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hyperhdr.public.apt.gpg.key] https://awawa-dev.github.io $(awk -F= '/VERSION_CODENAME/ {print $2}' /etc/os-release) main" >/etc/apt/sources.list.d/hyperhdr.list
+$STD apt-get update
+$STD apt-get install -y hyperhdr
+msg_ok "Installed HyperHDR"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/hyperhdr.service
+[Unit]
+Description=HyperHDR Service
+After=syslog.target network.target
+
+[Service]
+Restart=on-failure
+RestartSec=5
+Type=simple
+ExecStart=/usr/bin/hyperhdr
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now hyperhdr
+msg_ok "Created Service"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"

install/nginxproxymanager-install.sh

@@ -134,6 +134,7 @@ msg_ok "Set up Enviroment"
 msg_info "Building Frontend"
 cd ./frontend
 export NODE_ENV=development
+$STD yarn add -D sass-loader@10.5.2
 $STD yarn install --network-timeout=30000
 $STD yarn build
 cp -r dist/* /app/frontend

install/omada-install.sh

@@ -37,18 +37,18 @@ $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb
 msg_ok "Installed MongoDB"
 
 latest_url=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
-latest_version=$(basename "$latest_url" | sed -e 's/.*ller_//;s/_Li.*//')
+latest_version=$(basename "$latest_url")
 
-msg_info "Installing Omada Controller ${latest_version}"
+msg_info "Installing Omada Controller"
 wget -qL ${latest_url}
-$STD dpkg -i Omada_SDN_Controller_${latest_version}_Linux_x64.deb
-msg_ok "Installed Omada Controller ${latest_version}"
+$STD dpkg -i ${latest_version}
+msg_ok "Installed Omada Controller"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf Omada_SDN_Controller_${latest_version}_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb
+rm -rf ${latest_version} mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"

install/sonarr-install.sh

@@ -21,10 +21,7 @@ $STD apt-get install -y sqlite3
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Sonarr v4"
-$STD groupadd media
-$STD adduser --system --no-create-home --ingroup media sonarr
 mkdir -p /var/lib/sonarr/
-chown -R sonarr:media /var/lib/sonarr/
 chmod 775 /var/lib/sonarr/
 wget -q -O SonarrV4.tar.gz 'https://services.sonarr.tv/v1/download/main/latest?version=4&os=linux&arch=x64'
 tar -xzf SonarrV4.tar.gz
@@ -39,9 +36,6 @@ cat <<EOF >/etc/systemd/system/sonarr.service
 Description=Sonarr Daemon
 After=syslog.target network.target
 [Service]
-User=sonarr
-Group=media
-UMask=0002
 Type=simple
 ExecStart=/opt/Sonarr/Sonarr -nobrowser -data=/var/lib/sonarr/
 TimeoutStopSec=20

install/zigbee2mqtt-install.sh

@@ -50,7 +50,9 @@ fi
 msg_info "Installing Zigbee2MQTT"
 cd /opt/zigbee2mqtt
 if [[ $DEV == "y" ]]; then
+$STD git fetch origin dev:dev
 $STD git checkout dev
+$STD git pull
 fi
 $STD npm ci
 msg_ok "Installed Zigbee2MQTT"