From 169201a7517ed18a7066628e8df1c3b317efe80b Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:10:05 +0200 Subject: [PATCH 1/9] Add new LXC: ErsatzTV (#2876) --- ct/ersatztv.sh | 91 +++++++++++++++++++++++++++++++++++++ install/ersatztv-install.sh | 64 ++++++++++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 ct/ersatztv.sh create mode 100644 install/ersatztv-install.sh diff --git a/ct/ersatztv.sh b/ct/ersatztv.sh new file mode 100644 index 000000000..de21b8efb --- /dev/null +++ b/ct/ersatztv.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +# Copyright (c) 2021-2024 tteck +# Author: tteck +# Co-Author: MickLesk (Canbiz) +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE +# Source: https://github.com/ErsatzTV/ErsatzTV/ + + +function header_info { +clear +cat <<"EOF" + ______ __ _______ __ + / ____/_____________ _/ /_____/_ __/ | / / + / __/ / ___/ ___/ __ `/ __/_ / / / | | / / + / /___/ / (__ ) /_/ / /_ / /_/ / | |/ / +/_____/_/ /____/\__,_/\__/ /___/_/ |___/ + +EOF +} +header_info +echo -e "Loading..." +APP="ErsatzTV" +var_disk="5" +var_cpu="1" +var_ram="1024" +var_os="debian" +var_version="12" +variables +color +catch_errors + +function default_settings() { + CT_TYPE="1" + PW="" + CT_ID=$NEXTID + HN=$NSAPP + DISK_SIZE="$var_disk" + CORE_COUNT="$var_cpu" + RAM_SIZE="$var_ram" + BRG="vmbr0" + NET="dhcp" + GATE="" + APT_CACHER="" + APT_CACHER_IP="" + DISABLEIP6="no" + MTU="" + SD="" + NS="" + MAC="" + VLAN="" + SSH="no" + VERB="no" + echo_default +} +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 +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 +msg_ok "Updated ErsatzTV" + +msg_info "Starting ErsatzTV" +systemctl start ersatzTV +msg_ok "Started ErsatzTV" +msg_ok "Updated Successfully" +exit +} + +start +build_container +description + +msg_ok "Completed Successfully!\n" +echo -e "${APP} Setup should be reachable by going to the following URL. + ${BL}http://${IP}:8409${CL} \n" diff --git a/install/ersatztv-install.sh b/install/ersatztv-install.sh new file mode 100644 index 000000000..53a9c3edd --- /dev/null +++ b/install/ersatztv-install.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash + +# Copyright (c) 2021-2024 tteck +# Author: tteck +# Co-Author: MickLesk (Canbiz) +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE +# Source: https://github.com/ErsatzTV/ErsatzTV + +source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" +color +verb_ip6 +catch_errors +setting_up_container +network_check +update_os + +msg_info "Installing Dependencies (Patience)" +$STD apt-get install -y --no-install-recommends \ + ffmpeg \ + build-essential \ + unzip \ + pkg-config \ + curl \ + sudo \ + git \ + make \ + mc +msg_ok "Installed Dependencies" + + +msg_info "Installing ErsatzTV " +RELEASE=$(curl -s https://api.github.com/repos/ErsatzTV/ErsatzTV/releases | grep -oP '"tag_name": "\K[^"]+' | head -n 1) +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 +msg_ok "Installed ErsatzTV" + +msg_info "Creating Service" +cat </etc/systemd/system/ersatzTV.service +[Unit] +Description=ErsatzTV Service +After=multi-user.target + +[Service] +Type=simple +User=root +WorkingDirectory=/opt/ErsatzTV +ExecStart=/opt/ErsatzTV/ErsatzTV +Restart=always +RestartSec=30 + +[Install] +WantedBy=multi-user.target +EOF +systemctl -q --now enable ersatzTV.service +msg_ok "Created Service" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From cae357cc262d2b26a39a81249faa469225c43188 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 29 Apr 2024 10:39:51 -0400 Subject: [PATCH 2/9] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79b0c0353..a538c184a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ - 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. - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent Proxmox VE - Support Lifecycle** +## 2024-04-29 + +### Changed + +- **ErsatzTV LXC** + - NEW Script + ## 2024-04-28 ### Changed From 90003e72f383b116439270dbd74593b5ef7bb78a Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 30 Apr 2024 05:48:46 -0400 Subject: [PATCH 3/9] Update tdarr-install.sh Add Unprivileged Hardware Acceleration --- install/tdarr-install.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install/tdarr-install.sh b/install/tdarr-install.sh index f4f45d043..adf423cb8 100644 --- a/install/tdarr-install.sh +++ b/install/tdarr-install.sh @@ -20,19 +20,16 @@ $STD apt-get install -y mc $STD apt-get install -y handbrake-cli msg_ok "Installed Dependencies" +msg_info "Setting Up Hardware Acceleration" +$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools} if [[ "$CTTYPE" == "0" ]]; then - msg_info "Setting Up Hardware Acceleration" - $STD apt-get -y install \ - va-driver-all \ - ocl-icd-libopencl1 \ - intel-opencl-icd chgrp video /dev/dri chmod 755 /dev/dri chmod 660 /dev/dri/* $STD adduser $(id -u -n) video $STD adduser $(id -u -n) render - msg_ok "Set Up Hardware Acceleration" fi +msg_ok "Set Up Hardware Acceleration" msg_info "Installing Tdarr" mkdir -p /opt/tdarr @@ -43,7 +40,12 @@ $STD unzip Tdarr_Updater.zip rm -rf Tdarr_Updater.zip chmod +x Tdarr_Updater ./Tdarr_Updater &>/dev/null -sed -i -e 's/^sgx:x:104:$/render:x:104:root/' -e 's/^render:x:106:root$/sgx:x:106:/' /etc/group +if [[ "$CTTYPE" == "0" ]]; then + sed -i -e 's/^sgx:x:104:$/render:x:104:root/' -e 's/^render:x:106:root$/sgx:x:106:/' /etc/group +else + sed -i -e 's/^sgx:x:104:$/render:x:104:/' -e 's/^render:x:106:$/sgx:x:106:/' /etc/group +fi + msg_ok "Installed Tdarr" msg_info "Creating Service" From f041d5edead43360d8ae571376d97e87a6df59cf Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 30 Apr 2024 05:49:53 -0400 Subject: [PATCH 4/9] Update tdarr.sh Default settings are now Unprivileged --- ct/tdarr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/tdarr.sh b/ct/tdarr.sh index b658ec70e..11bc28805 100644 --- a/ct/tdarr.sh +++ b/ct/tdarr.sh @@ -29,7 +29,7 @@ color catch_errors function default_settings() { - CT_TYPE="0" + CT_TYPE="1" PW="" CT_ID=$NEXTID HN=$NSAPP From bd029543c89672b8cded1d3470667847ffc8515f Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 30 Apr 2024 05:59:53 -0400 Subject: [PATCH 5/9] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a538c184a..5237884c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ - 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. - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent Proxmox VE - Support Lifecycle** +## 2024-04-30 + +### Changed + +- **Tdarr LXC** + - Default settings are now **Unprivileged** + - Unprivileged Hardware Acceleration + ## 2024-04-29 ### Changed From 46be5a9b744cfc8691dab056f819572be84139c1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 30 Apr 2024 06:07:35 -0400 Subject: [PATCH 6/9] Update emby.sh Default settings are now Unprivileged --- ct/emby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/emby.sh b/ct/emby.sh index a8b5618a5..092a44a49 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -29,7 +29,7 @@ color catch_errors function default_settings() { - CT_TYPE="0" + CT_TYPE="1" PW="" CT_ID=$NEXTID HN=$NSAPP From e13303d2fc564c5748ef28f6f99f3fd8d3fa6973 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 1 May 2024 14:01:24 -0400 Subject: [PATCH 7/9] Update nextcloudpi-install.sh - Add `lbzip2` - testing --- install/nextcloudpi-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/nextcloudpi-install.sh b/install/nextcloudpi-install.sh index 9a53a2879..9a846d458 100644 --- a/install/nextcloudpi-install.sh +++ b/install/nextcloudpi-install.sh @@ -17,6 +17,7 @@ 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 lbzip2 msg_ok "Installed Dependencies" msg_info "Installing NextCloudPi (Patience)" From adb7bc55f4831c927ac71d658ce40b630d35857d Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 1 May 2024 14:16:32 -0400 Subject: [PATCH 8/9] Update nextcloudpi.sh Default Debian 12 --- ct/nextcloudpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/nextcloudpi.sh b/ct/nextcloudpi.sh index e4312b20d..7255de3d8 100644 --- a/ct/nextcloudpi.sh +++ b/ct/nextcloudpi.sh @@ -23,7 +23,7 @@ var_disk="8" var_cpu="2" var_ram="2048" var_os="debian" -var_version="11" +var_version="12" variables color catch_errors From ace4a8e43f1d83444a272357125965487cbb79b0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 1 May 2024 14:38:15 -0400 Subject: [PATCH 9/9] Update build.func fixes https://github.com/tteck/Proxmox/issues/2894 --- misc/build.func | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/build.func b/misc/build.func index 656dfedb2..f58149c1a 100644 --- a/misc/build.func +++ b/misc/build.func @@ -595,18 +595,20 @@ EOF fi else if [[ "$APP" == "Channels" || "$APP" == "Emby" || "$APP" == "Frigate" || "$APP" == "Jellyfin" || "$APP" == "Plex" || "$APP" == "Scrypted" || "$APP" == "Tdarr" || "$APP" == "Unmanic" ]]; then - if [[ -e "/dev/dri/card0" ]]; then + if [[ -e "/dev/dri/renderD128" ]]; then + if [[ -e "/dev/dri/card0" ]]; then cat <>$LXC_CONFIG # VAAPI hardware transcoding dev0: /dev/dri/card0,gid=44 dev1: /dev/dri/renderD128,gid=104 EOF - else + else cat <>$LXC_CONFIG # VAAPI hardware transcoding dev0: /dev/dri/card1,gid=44 dev1: /dev/dri/renderD128,gid=104 EOF + fi fi fi fi