From ea135820e36f70e49920cf6beaad5f6192381019 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 24 May 2024 11:47:34 -0400 Subject: [PATCH 1/5] Update photoprism.sh add `libvips42` to update --- ct/photoprism.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/photoprism.sh b/ct/photoprism.sh index 26e0c729c..593fe362e 100644 --- a/ct/photoprism.sh +++ b/ct/photoprism.sh @@ -64,6 +64,7 @@ function update_script() { msg_ok "Stopped PhotoPrism" msg_info "Updating PhotoPrism" + apt-get install -y libvips42 &>/dev/null wget -q -cO - https://dl.photoprism.app/pkg/linux/amd64.tar.gz | tar -xzf - -C /opt/photoprism --strip-components=1 msg_ok "Updated PhotoPrism" From acfb3eee043f733070e5cd46af7ab14b67d6311e Mon Sep 17 00:00:00 2001 From: Simon Albrecht Date: Sat, 25 May 2024 14:11:31 +0200 Subject: [PATCH 2/5] Add Threadfin (#3062) --- ct/threadfin.sh | 73 ++++++++++++++++++++++++++++++++++++ install/threadfin-install.sh | 55 +++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 ct/threadfin.sh create mode 100644 install/threadfin-install.sh diff --git a/ct/threadfin.sh b/ct/threadfin.sh new file mode 100644 index 000000000..e870e26ca --- /dev/null +++ b/ct/threadfin.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +# Copyright (c) 2021-2024 tteck +# Author: tteck (tteckster) +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE + +function header_info { +clear +cat <<"EOF" + ________ _______ + /_ __/ /_ ________ ____ _____/ / __(_)___ + / / / __ \/ ___/ _ \/ __ `/ __ / /_/ / __ \ + / / / / / / / / __/ /_/ / /_/ / __/ / / / / +/_/ /_/ /_/_/ \___/\__,_/\__,_/_/ /_/_/ /_/ + +EOF +} +header_info +echo -e "Loading..." +APP="Threadfin" +var_disk="4" +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/threadfin ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +msg_info "Updating $APP" +systemctl stop threadfin.service +wget -q -O /opt/threadfin/threadfin 'https://github.com/Threadfin/Threadfin/releases/latest/download/Threadfin_linux_amd64' +chmod +x /opt/threadfin/threadfin +systemctl start threadfin.service +msg_ok "Updated $APP" +exit +} + +start +build_container +description + +msg_ok "Completed Successfully!\n" +echo -e "${APP} should be reachable by going to the following URL. + ${BL}http://${IP}:34400/web${CL} \n" diff --git a/install/threadfin-install.sh b/install/threadfin-install.sh new file mode 100644 index 000000000..5fb8211d4 --- /dev/null +++ b/install/threadfin-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 sudo +$STD apt-get install -y mc +$STD apt-get install -y curl +$STD apt-get install -y ffmpeg +$STD apt-get install -y vlc +msg_ok "Installed Dependencies" + +msg_info "Installing Threadfin" +mkdir -p /opt/threadfin +wget -q -O /opt/threadfin/threadfin 'https://github.com/Threadfin/Threadfin/releases/latest/download/Threadfin_linux_amd64' +chmod +x /opt/threadfin/threadfin + +msg_ok "Installed Threadfin" + +msg_info "Creating Service" +cat </etc/systemd/system/threadfin.service +[Unit] +Description=Threadfin: M3U Proxy for Plex DVR and Emby/Jellyfin Live TV +After=syslog.target network.target +[Service] +Type=simple +WorkingDirectory=/opt/threadfin +ExecStart=/opt/threadfin/threadfin +TimeoutStopSec=20 +KillMode=process +Restart=on-failure +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now threadfin.service +msg_ok "Created Service" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get -y autoremove +$STD apt-get -y autoclean +msg_ok "Cleaned" From 0bd8035461454d5a4a7d4d8a33c817ecc86c8832 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 25 May 2024 08:29:34 -0400 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee22badf2..df5ba2125 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-05-25 + +### Changed + +- **Threadfin LXC** + - NEW Script + ## 2024-05-23 ### Changed From 574226d993cf649ac5f529068bfd1dc0cda1161f Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 25 May 2024 09:11:10 -0400 Subject: [PATCH 4/5] Update build.func add @asylumexp repo for ARM64 support. --- misc/build.func | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/build.func b/misc/build.func index efe812110..cd87d2c7f 100644 --- a/misc/build.func +++ b/misc/build.func @@ -111,6 +111,7 @@ pve_check() { arch_check() { if [ "$(dpkg --print-architecture)" != "amd64" ]; then echo -e "\n ${CROSS} This script will not work with PiMox! \n" + echo -e "\n Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n" echo -e "Exiting..." sleep 2 exit From a94bc0234ffe57dc5fee51d64c887d9c480e5643 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 25 May 2024 13:51:52 -0400 Subject: [PATCH 5/5] Update linkwarden-install.sh fixes https://github.com/tteck/Proxmox/issues/3065 --- install/linkwarden-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/linkwarden-install.sh b/install/linkwarden-install.sh index eaae6bfd1..9d5c455db 100644 --- a/install/linkwarden-install.sh +++ b/install/linkwarden-install.sh @@ -42,7 +42,7 @@ msg_ok "Cloned Linkwarden Repository" msg_info "Setting up PostgreSQL DB" DB_NAME=linkwardendb DB_USER=linkwarden -DB_PASS="$(openssl rand -base64 18 | cut -c1-13)" +DB_PASS="$(openssl rand -base64 18 | tr -d '/' | cut -c1-13)" $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';" $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMPLATE template0;"