From bf40c30fffee07424aba152aba05aa6403089725 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 16 Jul 2024 01:19:16 -0400 Subject: [PATCH 1/7] Update haos-vm.sh add local-zfs --- vm/haos-vm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index bad50312f..90bb9751e 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -428,7 +428,7 @@ nfs | dir) DISK_IMPORT="-format raw" THIN="" ;; -btrfs) +btrfs | local-zfs) DISK_EXT=".raw" DISK_REF="$VMID/" DISK_IMPORT="-format raw" From 9cbd0f30376787e49d3972fdbc0af6872467c1e6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 16 Jul 2024 11:27:55 -0400 Subject: [PATCH 2/7] Update install.func fixes https://github.com/tteck/Proxmox/issues/3386 --- misc/install.func | 3 +++ 1 file changed, 3 insertions(+) diff --git a/misc/install.func b/misc/install.func index c698e2584..660ea2c48 100644 --- a/misc/install.func +++ b/misc/install.func @@ -87,7 +87,10 @@ msg_error() { setting_up_container() { msg_info "Setting up Container OS" sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen + locale_line=$(grep -v '^#' /etc/locale.gen | grep -E '^[a-zA-Z]' | awk '{print $1}' | head -n 1) + echo "LANG=${locale_line}" >/etc/default/locale locale-gen >/dev/null + export LANG=${locale_line} echo $tz >/etc/timezone ln -sf /usr/share/zoneinfo/$tz /etc/localtime for ((i = RETRY_NUM; i > 0; i--)); do From 00a8f07170baae216a04a2617d9411d0fc2fd1d0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 16 Jul 2024 14:04:50 -0400 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01d7d1699..517cda16e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@

All notable changes to this project will be documented in this file.

-- The website source is private and will not be made open-source to help prevent copycat/coat-tailing sites from exploiting the project's popularity with potentially malicious intent. Please only trust information from https://Helper-Scripts.com/ or https://tteck.github.io/Proxmox/. +- Be cautious of copycat or coat-tailing sites that exploit the project's popularity with potentially malicious intent. Please only trust information from https://Helper-Scripts.com/ or https://tteck.github.io/Proxmox/. - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. From 9deea7a9830bb1457c1f051ca5f1e7c7d6d127e7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 17 Jul 2024 13:32:26 -0400 Subject: [PATCH 4/7] Update vaultwarden.sh add Admin Token to `/opt/vaultwarden/data/config.json` --- ct/vaultwarden.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index b5cb6fa52..413cd5faf 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -127,7 +127,9 @@ function update_script() { if [[ -z "$NEWTOKEN" ]]; then exit; fi if ! command -v argon2 >/dev/null 2>&1; then apt-get install -y argon2 &>/dev/null; fi TOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -t 2 -m 16 -p 4 -l 64 -e) - sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env + for file in /opt/vaultwarden/.env /opt/vaultwarden/data/config.json; do + sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" "$file" + done systemctl restart vaultwarden fi exit From cfa1b2e04d9056fe96981677bd856f7111ad9495 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 17 Jul 2024 13:48:42 -0400 Subject: [PATCH 5/7] Update vaultwarden.sh tweak --- ct/vaultwarden.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index 413cd5faf..f7901b791 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -127,9 +127,10 @@ function update_script() { if [[ -z "$NEWTOKEN" ]]; then exit; fi if ! command -v argon2 >/dev/null 2>&1; then apt-get install -y argon2 &>/dev/null; fi TOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -t 2 -m 16 -p 4 -l 64 -e) - for file in /opt/vaultwarden/.env /opt/vaultwarden/data/config.json; do - sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" "$file" - done + sed -i "s|ADMIN_TOKEN=.*|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env + if [[ -f /opt/vaultwarden/data/config.json ]]; then + sed -i "s|\"admin_token\":.*|\"admin_token\": \"${TOKEN}\"|" /opt/vaultwarden/data/config.json + fi systemctl restart vaultwarden fi exit From 2febf2c39bbdca74507a864b632908f4c14a8265 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 20 Jul 2024 06:20:20 -0400 Subject: [PATCH 6/7] Update unifi.sh add AVX instruction set check --- ct/unifi.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ct/unifi.sh b/ct/unifi.sh index 820930c0d..cec984c5b 100644 --- a/ct/unifi.sh +++ b/ct/unifi.sh @@ -17,6 +17,10 @@ cat <<"EOF" EOF } header_info +if ! grep -q -m1 'avx[^ ]*' /proc/cpuinfo; then + echo "AVX instruction set is not supported on this CPU." + exit +fi echo -e "Loading..." APP="Unifi" var_disk="8" From 6c155c7463a3c22bc73aed0165ba879f5d70dff4 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 20 Jul 2024 12:44:27 -0400 Subject: [PATCH 7/7] Update ersatztv.sh Refactor `function update_script ()` fixes https://github.com/tteck/Proxmox/issues/3404 --- ct/ersatztv.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ct/ersatztv.sh b/ct/ersatztv.sh index de21b8efb..81ea5b7b3 100644 --- a/ct/ersatztv.sh +++ b/ct/ersatztv.sh @@ -57,22 +57,20 @@ function default_settings() { function update_script() { header_info if [[ ! -d /opt/ErsatzTV ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -if (( $(df /boot | awk 'NR==2{gsub("%","",$5); print $5}') > 80 )); then - read -r -p "Warning: Storage is dangerously low, continue anyway? " prompt - [[ ${prompt,,} =~ ^(y|yes)$ ]] || exit -fi + msg_info "Stopping ErsatzTV" systemctl stop ersatzTV msg_ok "Stopped ErsatzTV" msg_info "Updating ErsatzTV" RELEASE=$(curl -s https://api.github.com/repos/ErsatzTV/ErsatzTV/releases | grep -oP '"tag_name": "\K[^"]+' | head -n 1) -if [ -d /opt/ErsatzTV/ErsatzTV_bak ]; then - rm -rf /opt/ErsatzTV/ErsatzTV_bak -fi -mv /opt/ErsatzTV/ErsatzTV /opt/ErsatzTV/ErsatzTV_bak +cp -R /opt/ErsatzTV/ ErsatzTV-backup +rm ErsatzTV-backup/ErsatzTV +rm -rf /opt/ErsatzTV wget -qO- "https://github.com/ErsatzTV/ErsatzTV/releases/download/${RELEASE}/ErsatzTV-${RELEASE}-linux-x64.tar.gz" | tar -xz -C /opt mv "/opt/ErsatzTV-${RELEASE}-linux-x64" /opt/ErsatzTV +cp -R ErsatzTV-backup/* /opt/ErsatzTV/ +rm -rf ErsatzTV-backup msg_ok "Updated ErsatzTV" msg_info "Starting ErsatzTV"