From ae79d3a3325b65c0a9b032311c8102d3aae28a50 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 26 Feb 2024 16:41:27 +0500 Subject: [PATCH 01/56] Add Mafl Dashboard (#2562) --- ct/mafl.sh | 73 +++++++++++++++++++++++++++++++++++++ install/mafl-install.sh | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 ct/mafl.sh create mode 100644 install/mafl-install.sh diff --git a/ct/mafl.sh b/ct/mafl.sh new file mode 100644 index 00000000..19012b6a --- /dev/null +++ b/ct/mafl.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="Mafl" +var_disk="6" +var_cpu="2" +var_ram="2048" +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/mafl ]]; then msg_error "No ${APP} Installation Found!"; exit; fi + msg_error "There is currently no update path available." + exit +} + +start +build_container +description + +msg_info "Setting Container to Normal Resources" +pct set $CTID -memory 1024 +pct set $CTID -cores 1 +msg_ok "Set Container to Normal Resources" + +msg_ok "Completed Successfully!\n" +echo -e "${APP} should be reachable by going to the following URL. + ${BL}http://${IP}:3000${CL} \n" diff --git a/install/mafl-install.sh b/install/mafl-install.sh new file mode 100644 index 00000000..63f30288 --- /dev/null +++ b/install/mafl-install.sh @@ -0,0 +1,81 @@ +#!/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 make +$STD apt-get install -y g++ +$STD apt-get install -y gcc +$STD apt-get install -y ca-certificates +$STD apt-get install -y gnupg +msg_ok "Installed Dependencies" + +msg_info "Setting up Node.js Repository" +mkdir -p /etc/apt/keyrings +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +msg_ok "Set up Node.js Repository" + +msg_info "Installing Node.js" +$STD apt-get update +$STD apt-get install -y nodejs +$STD npm install -g npm@latest +$STD npm install -g yarn +msg_ok "Installed Node.js" + +RELEASE=$(curl -s https://api.github.com/repos/hywax/mafl/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') +msg_info "Installing Mafl v${RELEASE}" +wget -q https://github.com/hywax/mafl/archive/refs/tags/v${RELEASE}.tar.gz +tar -xzf v${RELEASE}.tar.gz +mkdir -p /opt/mafl/data +wget -q -O /opt/mafl/data/config.yml https://raw.githubusercontent.com/hywax/mafl/main/.example/config.yml +mv mafl-${RELEASE}/* /opt/mafl +rm -rf mafl-${RELEASE} +cd /opt/mafl +export NUXT_TELEMETRY_DISABLED=true +$STD yarn install +$STD yarn build +msg_ok "Installed Mafl v${RELEASE}" + +msg_info "Creating Service" +cat </etc/systemd/system/mafl.service +[Unit] +Description=Mafl +After=network.target +StartLimitIntervalSec=0 + +[Service] +Type=simple +Restart=always +RestartSec=1 +User=root +WorkingDirectory=/opt/mafl/ +ExecStart=yarn preview + +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now mafl +msg_ok "Created Service" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From a31a44b271a0123ca328c23d5f0e99a307f4b004 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 26 Feb 2024 07:03:12 -0500 Subject: [PATCH 02/56] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e6952e6..dfb16224 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-02-26 + +### Changed + +- **Mafl LXC** + - NEW Script + ## 2024-02-23 ### Changed From b88dc1338313d9eca530adf82a8546b3af192850 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 26 Feb 2024 14:04:12 -0500 Subject: [PATCH 03/56] Update changedetection.sh `systemctl restart changedetection` after update --- ct/changedetection.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/changedetection.sh b/ct/changedetection.sh index e5fe9ecb..4eda7b24 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -58,6 +58,7 @@ if [[ ! -f /etc/systemd/system/changedetection.service ]]; then msg_error "No ${ msg_info "Updating ${APP} LXC" pip3 install changedetection.io --upgrade &>/dev/null pip3 install playwright --upgrade &>/dev/null +systemctl restart changedetection msg_ok "Updated Successfully" exit } From 58f69adbd8e4f3b0f64b8e4a77d4483d109fe5e4 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 26 Feb 2024 15:15:17 -0500 Subject: [PATCH 04/56] Update mariadb-install.sh - remove Adminer - fixes https://github.com/tteck/Proxmox/issues/2565 --- install/mariadb-install.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/install/mariadb-install.sh b/install/mariadb-install.sh index 310b6c26..047d1d05 100644 --- a/install/mariadb-install.sh +++ b/install/mariadb-install.sh @@ -27,15 +27,6 @@ sed -i 's/^# *\(port *=.*\)/\1/' /etc/mysql/my.cnf sed -i 's/^bind-address/#bind-address/g' /etc/mysql/mariadb.conf.d/50-server.cnf msg_ok "Installed MariaDB" -read -r -p "Would you like to add Adminer? " prompt -if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then - msg_info "Installing Adminer" - $STD apt install -y adminer - $STD a2enconf adminer - systemctl reload apache2 - msg_ok "Installed Adminer" -fi - motd_ssh customize From 0c963550c49b41a4733004ecb6400f1791044068 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 27 Feb 2024 11:28:05 -0500 Subject: [PATCH 05/56] Update USER_SUBMITTED_GUIDES.md --- USER_SUBMITTED_GUIDES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/USER_SUBMITTED_GUIDES.md b/USER_SUBMITTED_GUIDES.md index 6e382223..a78e4099 100644 --- a/USER_SUBMITTED_GUIDES.md +++ b/USER_SUBMITTED_GUIDES.md @@ -34,3 +34,5 @@ [iGPU Transcoding In Proxmox with Jellyfin](https://www.youtube.com/watch?v=XAa_qpNmzZs) [Proxmox + NetData]() + +[Proxmox Homelab Series]() From d77cffd0068d2a60b03fd620c8fbf39af558bef7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 27 Feb 2024 11:29:22 -0500 Subject: [PATCH 06/56] Update USER_SUBMITTED_GUIDES.md --- USER_SUBMITTED_GUIDES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USER_SUBMITTED_GUIDES.md b/USER_SUBMITTED_GUIDES.md index a78e4099..8ac04a12 100644 --- a/USER_SUBMITTED_GUIDES.md +++ b/USER_SUBMITTED_GUIDES.md @@ -35,4 +35,4 @@ [Proxmox + NetData]() -[Proxmox Homelab Series]() +[Proxmox Homelab Series]() From 7759ecf7ddc1bbd698140f3ab2434608253785a2 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Feb 2024 09:06:25 -0500 Subject: [PATCH 07/56] Update unifi-install.sh update libssl --- install/unifi-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/unifi-install.sh b/install/unifi-install.sh index 9ff1d08f..32327d4d 100644 --- a/install/unifi-install.sh +++ b/install/unifi-install.sh @@ -29,8 +29,8 @@ $STD apt-get install -y temurin-17-jre msg_ok "Installed OpenJDK" msg_info "Installing MongoDB" -wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb -$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb +wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb +$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb wget -qO- https://pgp.mongodb.com/server-4.4.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg echo 'deb [ arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main' >/etc/apt/sources.list.d/mongodb-org-4.4.list $STD apt-get update @@ -48,7 +48,7 @@ motd_ssh customize msg_info "Cleaning up" -rm -rf libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb +rm -rf libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb $STD apt-get autoremove $STD apt-get autoclean msg_ok "Cleaned" From 7f02d0e51b8b3c4a631b4e1fce85914b2b5f810e Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Feb 2024 09:41:51 -0500 Subject: [PATCH 08/56] Update unifi-install.sh always download latest libssl --- install/unifi-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/unifi-install.sh b/install/unifi-install.sh index 32327d4d..ad1d1efb 100644 --- a/install/unifi-install.sh +++ b/install/unifi-install.sh @@ -29,7 +29,8 @@ $STD apt-get install -y temurin-17-jre msg_ok "Installed OpenJDK" msg_info "Installing MongoDB" -wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb +libssl=$(curl -fsSL "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/" | grep -o 'libssl1\.1_1\.1\.1f-1ubuntu2\.2[^"]*amd64\.deb' | head -n1) +wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$libssl $STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb wget -qO- https://pgp.mongodb.com/server-4.4.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg echo 'deb [ arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main' >/etc/apt/sources.list.d/mongodb-org-4.4.list From 0567a46afd9660fd37d22fe819dbf35e266437a6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Feb 2024 15:37:33 -0500 Subject: [PATCH 09/56] Update unifi-install.sh tweak --- install/unifi-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/unifi-install.sh b/install/unifi-install.sh index ad1d1efb..54fbef00 100644 --- a/install/unifi-install.sh +++ b/install/unifi-install.sh @@ -31,7 +31,7 @@ msg_ok "Installed OpenJDK" msg_info "Installing MongoDB" libssl=$(curl -fsSL "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/" | grep -o 'libssl1\.1_1\.1\.1f-1ubuntu2\.2[^"]*amd64\.deb' | head -n1) wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$libssl -$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb +$STD dpkg -i $libssl wget -qO- https://pgp.mongodb.com/server-4.4.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg echo 'deb [ arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main' >/etc/apt/sources.list.d/mongodb-org-4.4.list $STD apt-get update @@ -49,7 +49,7 @@ motd_ssh customize msg_info "Cleaning up" -rm -rf libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb +rm -rf $libssl $STD apt-get autoremove $STD apt-get autoclean msg_ok "Cleaned" From 9cad7288c94889034b612a26d0980b2a5d93bfa6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Feb 2024 17:11:59 -0500 Subject: [PATCH 10/56] Update deconz-install.sh fixes https://github.com/tteck/Proxmox/issues/2578 --- install/deconz-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/deconz-install.sh b/install/deconz-install.sh index 328a9679..614129e7 100644 --- a/install/deconz-install.sh +++ b/install/deconz-install.sh @@ -26,8 +26,9 @@ echo "deb [arch=amd64] http://phoscon.de/apt/deconz $VERSION main" >/etc/apt/sou msg_ok "Setup Phoscon Repository" msg_info "Installing deConz" -wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb -$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb +libssl=$(curl -fsSL "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/" | grep -o 'libssl1\.1_1\.1\.1f-1ubuntu2\.2[^"]*amd64\.deb' | head -n1) +wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$libssl +$STD dpkg -i $libssl $STD apt-get update $STD apt-get install -y deconz msg_ok "Installed deConz" @@ -56,7 +57,7 @@ motd_ssh customize msg_info "Cleaning up" -rm -rf libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb +rm -rf $libssl $STD apt-get autoremove $STD apt-get autoclean msg_ok "Cleaned" From e5ec531d4f1a383ef7d4f9468457e0bb3a08e096 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Feb 2024 17:13:07 -0500 Subject: [PATCH 11/56] Update omada-install.sh update libssl --- install/omada-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/omada-install.sh b/install/omada-install.sh index 4e78c5c7..b27f3728 100644 --- a/install/omada-install.sh +++ b/install/omada-install.sh @@ -30,8 +30,9 @@ $STD apt-get -y install zulu8-jdk msg_ok "Installed Azul Zulu" msg_info "Installing MongoDB" -wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb -$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb +libssl=$(curl -fsSL "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/" | grep -o 'libssl1\.1_1\.1\.1f-1ubuntu2\.2[^"]*amd64\.deb' | head -n1) +wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$libssl +$STD dpkg -i $libssl wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiverse/binary-amd64/mongodb-org-server_3.6.23_amd64.deb $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb msg_ok "Installed MongoDB" @@ -48,7 +49,7 @@ motd_ssh customize msg_info "Cleaning up" -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.21_amd64.deb +rm -rf ${latest_version} mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb $libssl $STD apt-get autoremove $STD apt-get autoclean msg_ok "Cleaned" From dd4d449c953b95c195dbd7e6b9d8e23ac2f8ab04 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 1 Mar 2024 04:30:17 -0500 Subject: [PATCH 12/56] Update omada-install.sh tweak --- install/omada-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/omada-install.sh b/install/omada-install.sh index b27f3728..d3768a98 100644 --- a/install/omada-install.sh +++ b/install/omada-install.sh @@ -37,7 +37,7 @@ wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiv $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_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1) latest_version=$(basename "$latest_url") msg_info "Installing Omada Controller" From 05dc5371243fac3891ff14b1a67cecf03d85b061 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 1 Mar 2024 04:31:17 -0500 Subject: [PATCH 13/56] Update omada.sh tweak --- ct/omada.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/omada.sh b/ct/omada.sh index 82f28261..c664953e 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -55,7 +55,7 @@ function default_settings() { function update_script() { header_info if [[ ! -d /opt/tplink ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -latest_url=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1) +latest_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1) latest_version=$(basename "${latest_url}") if [ -z "${latest_version}" ]; then msg_error "It seems that the server (tp-link.com) might be down. Please try again at a later time." From 57d06ad2bef3e2dc01a4ba16297d830096203d2c Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 1 Mar 2024 04:48:34 -0500 Subject: [PATCH 14/56] Update home-assistant-core-copy-data-home-assistant-core.sh Stop both containers. --- .../home-assistant-core-copy-data-home-assistant-core.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/misc/copy-data/home-assistant-core-copy-data-home-assistant-core.sh b/misc/copy-data/home-assistant-core-copy-data-home-assistant-core.sh index c0cf2868..68c388ed 100644 --- a/misc/copy-data/home-assistant-core-copy-data-home-assistant-core.sh +++ b/misc/copy-data/home-assistant-core-copy-data-home-assistant-core.sh @@ -83,6 +83,10 @@ whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "$TITLE" -- $CTID_FROM (${CTID_FROM_HOSTNAME}) -> $CTID_TO (${CTID_TO_HOSTNAME}) Version: 2022.10.03" 13 50 || exit info "Home Assistant Data from '$CTID_FROM' to '$CTID_TO'" +if [ $(pct status $CTID_FROM | sed 's/.* //') == 'running' ]; then + msg "Stopping '$CTID_FROM'..." + pct stop $CTID_FROM +fi if [ $(pct status $CTID_TO | sed 's/.* //') == 'running' ]; then msg "Stopping '$CTID_TO'..." pct stop $CTID_TO From 55a107b29ff839a864b5deebc0182d6f4d069d31 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 1 Mar 2024 09:23:54 -0500 Subject: [PATCH 15/56] Update emby-install.sh set static version --- install/emby-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/emby-install.sh b/install/emby-install.sh index 72158183..83245643 100644 --- a/install/emby-install.sh +++ b/install/emby-install.sh @@ -33,8 +33,9 @@ fi LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4) msg_info "Installing Emby" -wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb -$STD dpkg -i emby-server-deb_${LATEST}_amd64.deb +#wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb +wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/4.8.1.0/emby-server-deb_4.8.1.0_amd64.deb +$STD dpkg -i emby-server-deb_4.8.1.0_amd64.deb sed -i -e 's/^ssl-cert:x:104:$/render:x:104:root,emby/' -e 's/^render:x:108:root,emby$/ssl-cert:x:108:/' /etc/group msg_ok "Installed Emby" @@ -44,5 +45,5 @@ customize msg_info "Cleaning up" $STD apt-get autoremove $STD apt-get autoclean -rm emby-server-deb_${LATEST}_amd64.deb +rm emby-server-deb_4.8.1.0_amd64.deb msg_ok "Cleaned" From 89d9b9ca9f0b749243b51b0be3e9bc96f7ce7007 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 1 Mar 2024 09:25:32 -0500 Subject: [PATCH 16/56] Update emby.sh set static version --- ct/emby.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ct/emby.sh b/ct/emby.sh index a8b5618a..b198f002 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -61,9 +61,9 @@ systemctl stop emby-server msg_ok "Stopped ${APP}" msg_info "Updating ${APP}" -wget https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb &>/dev/null -dpkg -i emby-server-deb_${LATEST}_amd64.deb &>/dev/null -rm emby-server-deb_${LATEST}_amd64.deb +wget https://github.com/MediaBrowser/Emby.Releases/releases/download/4.8.1.0/emby-server-deb_4.8.1.0_amd64.deb &>/dev/null +dpkg -i emby-server-deb_4.8.1.0_amd64.deb &>/dev/null +rm emby-server-deb_4.8.1.0_amd64.deb msg_ok "Updated ${APP}" msg_info "Starting ${APP}" From 9e7b96e9dfcd3efc7a303205e30b67aaf81e684c Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 3 Mar 2024 06:22:50 -0500 Subject: [PATCH 17/56] Update grafana.sh tweak --- ct/grafana.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ct/grafana.sh b/ct/grafana.sh index 085cb4ee..b5ea2aa9 100644 --- a/ct/grafana.sh +++ b/ct/grafana.sh @@ -56,9 +56,6 @@ function update_script() { header_info if [[ ! -f /etc/apt/sources.list.d/grafana.list ]]; then msg_error "No ${APP} Installation Found!"; exit; fi msg_info "Updating ${APP}" -apt-key del 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 -wget -q -O /usr/share/keyrings/grafana.key https://apt.grafana.com/gpg.key -echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" | tee /etc/apt/sources.list.d/grafana.list apt-get update &>/dev/null apt-get -y upgrade &>/dev/null msg_ok "Updated Successfully" From 7b1738ca7b6bb5b022f6cb1dafbb2ef094a85133 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 3 Mar 2024 07:44:41 -0500 Subject: [PATCH 18/56] Update nginxproxymanager-install.sh set pnpm version --- install/nginxproxymanager-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 48017b6f..cf7ca741 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -61,7 +61,7 @@ ln -sf /root/.nvm/versions/node/v16.20.2/bin/node /usr/bin/node msg_ok "Installed Node.js" msg_info "Installing pnpm" -$STD npm install -g pnpm +$STD npm install -g pnpm@8.15 msg_ok "Installed pnpm" RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | From 511fd50ebb53dbb2f5a45f604bc6eff24b7607d9 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 3 Mar 2024 18:02:12 -0500 Subject: [PATCH 19/56] Update emby-install.sh install the latest version --- install/emby-install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/install/emby-install.sh b/install/emby-install.sh index 83245643..72158183 100644 --- a/install/emby-install.sh +++ b/install/emby-install.sh @@ -33,9 +33,8 @@ fi LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4) msg_info "Installing Emby" -#wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb -wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/4.8.1.0/emby-server-deb_4.8.1.0_amd64.deb -$STD dpkg -i emby-server-deb_4.8.1.0_amd64.deb +wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb +$STD dpkg -i emby-server-deb_${LATEST}_amd64.deb sed -i -e 's/^ssl-cert:x:104:$/render:x:104:root,emby/' -e 's/^render:x:108:root,emby$/ssl-cert:x:108:/' /etc/group msg_ok "Installed Emby" @@ -45,5 +44,5 @@ customize msg_info "Cleaning up" $STD apt-get autoremove $STD apt-get autoclean -rm emby-server-deb_4.8.1.0_amd64.deb +rm emby-server-deb_${LATEST}_amd64.deb msg_ok "Cleaned" From 912f0e01ba9c90ed295da298ef926925d325b575 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 3 Mar 2024 18:03:28 -0500 Subject: [PATCH 20/56] Update emby.sh tweak --- ct/emby.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ct/emby.sh b/ct/emby.sh index b198f002..a8b5618a 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -61,9 +61,9 @@ systemctl stop emby-server msg_ok "Stopped ${APP}" msg_info "Updating ${APP}" -wget https://github.com/MediaBrowser/Emby.Releases/releases/download/4.8.1.0/emby-server-deb_4.8.1.0_amd64.deb &>/dev/null -dpkg -i emby-server-deb_4.8.1.0_amd64.deb &>/dev/null -rm emby-server-deb_4.8.1.0_amd64.deb +wget https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb &>/dev/null +dpkg -i emby-server-deb_${LATEST}_amd64.deb &>/dev/null +rm emby-server-deb_${LATEST}_amd64.deb msg_ok "Updated ${APP}" msg_info "Starting ${APP}" From c7e4f370c612f2385c38a9d5ed35404f7a5091b5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 6 Mar 2024 05:31:07 -0500 Subject: [PATCH 21/56] Update prometheus.sh fixes https://github.com/tteck/Proxmox/issues/2607 --- ct/prometheus.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ct/prometheus.sh b/ct/prometheus.sh index ae519078..b2230eaa 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -55,10 +55,7 @@ function default_settings() { function update_script() { header_info if [[ ! -f /etc/systemd/system/prometheus.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -msg_info "Updating ${APP} LXC" -apt-get update &>/dev/null -apt-get -y upgrade &>/dev/null -msg_ok "Updated Successfully" +msg_error "There is currently no update path available." exit } From a6b415bc3691e949edcecc829cf2abf4d1a88956 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 6 Mar 2024 05:50:36 -0500 Subject: [PATCH 22/56] Update code-server.sh fixes https://github.com/tteck/Proxmox/issues/2608 --- misc/code-server.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/code-server.sh b/misc/code-server.sh index 6ae2d024..cbc140d9 100644 --- a/misc/code-server.sh +++ b/misc/code-server.sh @@ -47,6 +47,7 @@ function error_exit() { clear header_info if command -v pveversion >/dev/null 2>&1; then echo -e "⚠️ Can't Install on Proxmox "; exit; fi +if [ -e /etc/alpine-release ]; then echo -e "⚠️ Can't Install on Alpine"; exit; fi while true; do read -p "This will Install ${APP} on $hostname. Proceed(y/n)?" yn case $yn in From 8bbb33b97b51bca78e64bc73d745a309f5405e74 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 6 Mar 2024 13:58:29 +0000 Subject: [PATCH 23/56] Update photoprism-install.sh (#2609) add rawtherapee dependency to enable raw image conversion --- install/photoprism-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/photoprism-install.sh b/install/photoprism-install.sh index 2f80b6cc..d1d950ad 100644 --- a/install/photoprism-install.sh +++ b/install/photoprism-install.sh @@ -25,6 +25,7 @@ $STD apt-get install -y libjpeg-dev $STD apt-get install -y libtiff-dev $STD apt-get install -y imagemagick $STD apt-get install -y darktable +$STD apt-get install -y rawtherapee msg_ok "Installed Dependencies" From ea1e30dfa928debfc513c8e823c1eae5d9e92dd5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 6 Mar 2024 14:14:05 +0000 Subject: [PATCH 24/56] Update photoprism-install.sh (#2610) For some reason it seems as though the binaries as part of `libheif1` install not to `/usr/local/bin` but to `/usr/local` and so were not on the path, therefore the default value of photoprism's `--heifconvert-bin` / `$PHOTOPRISM_HEIFCONVERT_BIN` (`heif-convert`) would not be resolved --- install/photoprism-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/photoprism-install.sh b/install/photoprism-install.sh index d1d950ad..a7bec81f 100644 --- a/install/photoprism-install.sh +++ b/install/photoprism-install.sh @@ -27,6 +27,8 @@ $STD apt-get install -y imagemagick $STD apt-get install -y darktable $STD apt-get install -y rawtherapee +echo 'export PATH=/usr/local:$PATH' >>~/.bashrc +export PATH=/usr/local:$PATH msg_ok "Installed Dependencies" msg_info "Installing PhotoPrism (Patience)" From 183340bc853089e0a3800a4da527b6b9614bb175 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 6 Mar 2024 18:45:37 -0500 Subject: [PATCH 25/56] Update dashy-install.sh fixes https://github.com/tteck/Proxmox/issues/2614 --- install/dashy-install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index 2962161d..d0709fb5 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -17,7 +17,6 @@ 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 git msg_ok "Installed Dependencies" msg_info "Installing Node.js (Patience)" @@ -35,10 +34,12 @@ ln -sf /usr/local/bin/yarn /usr/bin/yarn msg_ok "Installed Yarn" msg_info "Installing Dashy (Patience)" -$STD git clone https://github.com/Lissy93/dashy.git -cd /dashy +mkdir -p /opt/dashy +#RELEASE=$(curl -s https://api.github.com/repos/Lissy93/dashy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') +#wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1 +wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/2.1.1.tar.gz | tar -xz -C /opt/dashy --strip-components=1 +cd /opt/dashy $STD yarn -export NODE_OPTIONS=--max-old-space-size=1000 $STD yarn build msg_ok "Installed Dashy" @@ -49,7 +50,7 @@ Description=dashy [Service] Type=simple -WorkingDirectory=/dashy +WorkingDirectory=/opt/dashy ExecStart=/usr/bin/yarn start [Install] WantedBy=multi-user.target From 321660487de3d1df302c47e0ba21a999db28020b Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 6 Mar 2024 18:48:53 -0500 Subject: [PATCH 26/56] Update dashy.sh There is currently no update path available. --- ct/dashy.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ct/dashy.sh b/ct/dashy.sh index 759b8805..23a28334 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -54,7 +54,9 @@ function default_settings() { function update_script() { header_info -if [[ ! -d /dashy/public/ ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +if [[ ! -d /opt/dashy/public/ ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +msg_error "There is currently no update path available." +exit msg_info "Stopping ${APP}" systemctl stop dashy msg_ok "Stopped ${APP}" From 64bf64ff183c0aed9d19ca08cecee033ba025277 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 10:16:49 -0500 Subject: [PATCH 27/56] Update mqtt-install.sh fixes https://github.com/tteck/Proxmox/issues/2617 --- install/mqtt-install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index 860c70bb..c9b372b3 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -22,8 +22,11 @@ msg_ok "Installed Dependencies" msg_info "Installing Mosquitto MQTT Broker" if [ "$PCT_OSTYPE" == "debian" ]; then VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" - wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc - wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list + # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc + # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list + gpg --keyserver keyserver.ubuntu.com --recv-keys 779B22DFB3E717B7 >/dev/null 2>&1 + gpg --export 779B22DFB3E717B7 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 + echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list $STD apt-get update fi $STD apt-get -y install mosquitto From d9736097bbf8a5f3fbe647a1b1c63c646316004b Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 10:25:59 -0500 Subject: [PATCH 28/56] Update mqtt-install.sh test --- install/mqtt-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index c9b372b3..48cff6f1 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -21,12 +21,14 @@ msg_ok "Installed Dependencies" msg_info "Installing Mosquitto MQTT Broker" if [ "$PCT_OSTYPE" == "debian" ]; then + set +Eeuo pipefail VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list gpg --keyserver keyserver.ubuntu.com --recv-keys 779B22DFB3E717B7 >/dev/null 2>&1 gpg --export 779B22DFB3E717B7 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list + set -Eeuo pipefail $STD apt-get update fi $STD apt-get -y install mosquitto From 6e0f3742852bec6d02e6ea2b47ea43480fb20957 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 10:29:48 -0500 Subject: [PATCH 29/56] Update mqtt-install.sh add gpg --- install/mqtt-install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index 48cff6f1..1f1d0d31 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -17,18 +17,17 @@ 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 Mosquitto MQTT Broker" if [ "$PCT_OSTYPE" == "debian" ]; then - set +Eeuo pipefail VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list gpg --keyserver keyserver.ubuntu.com --recv-keys 779B22DFB3E717B7 >/dev/null 2>&1 gpg --export 779B22DFB3E717B7 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list - set -Eeuo pipefail $STD apt-get update fi $STD apt-get -y install mosquitto From 87cee4cd57cb8d2191d6d63a4ad344a2642c048b Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 13:29:01 -0500 Subject: [PATCH 30/56] Update changedetection-install.sh add jpeg-dev, libjpeg --- install/changedetection-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index e670943b..8bca81a4 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -23,6 +23,8 @@ $STD apt-get install -y \ dumb-init \ gconf-service \ libatk-bridge2.0-0 \ + jpeg-dev \ + libjpeg \ libasound2 \ libatk1.0-0 \ libcairo2 \ From 1edd9bfb391d22d00377d2c4020cf0a8571df1a2 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 13:38:36 -0500 Subject: [PATCH 31/56] Update changedetection-install.sh revert --- install/changedetection-install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index 8bca81a4..e670943b 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -23,8 +23,6 @@ $STD apt-get install -y \ dumb-init \ gconf-service \ libatk-bridge2.0-0 \ - jpeg-dev \ - libjpeg \ libasound2 \ libatk1.0-0 \ libcairo2 \ From 8b03579df9999f8de8c934a5fb609b3ab7981961 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 13:58:07 -0500 Subject: [PATCH 32/56] Update tandoor-install.sh fixes https://github.com/tteck/Proxmox/issues/2621 --- install/tandoor-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 509121e4..87fdd91b 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -127,7 +127,6 @@ server { location / { proxy_set_header Host $http_host; proxy_pass http://unix:/opt/tandoor/tandoor.sock; - proxy_set_header X-Forwarded-Proto $scheme; } } EOF From 02afb23aed629f35c98452a75b26a740cee6a4d3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 14:17:39 -0500 Subject: [PATCH 33/56] Update changedetection-install.sh add libjpeg-dev --- install/changedetection-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index e670943b..d685153a 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -22,6 +22,7 @@ $STD apt-get install -y \ build-essential \ dumb-init \ gconf-service \ + libjpeg-dev \ libatk-bridge2.0-0 \ libasound2 \ libatk1.0-0 \ From a4a692f4495f4ac2b7a480a26821462ce11e20e7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 14:24:49 -0500 Subject: [PATCH 34/56] Update changedetection.sh if libjpeg-dev is not installed, install it --- ct/changedetection.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ct/changedetection.sh b/ct/changedetection.sh index 4eda7b24..b6f42369 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -56,6 +56,10 @@ function update_script() { header_info if [[ ! -f /etc/systemd/system/changedetection.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi msg_info "Updating ${APP} LXC" +if ! dpkg -s libjpeg-dev >/dev/null 2>&1; then + apt-get update + apt-get install -y libjpeg-dev +fi pip3 install changedetection.io --upgrade &>/dev/null pip3 install playwright --upgrade &>/dev/null systemctl restart changedetection From f14b6f49d7ec903298829a5e42ecb85f7f4e5479 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 15:10:25 -0500 Subject: [PATCH 35/56] Update mqtt-install.sh update keys --- install/mqtt-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index 1f1d0d31..c9c9c164 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -25,8 +25,8 @@ if [ "$PCT_OSTYPE" == "debian" ]; then VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list - gpg --keyserver keyserver.ubuntu.com --recv-keys 779B22DFB3E717B7 >/dev/null 2>&1 - gpg --export 779B22DFB3E717B7 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 + gpg --keyserver keyserver.ubuntu.com --recv-keys 61611AE430993623 >/dev/null 2>&1 + gpg --export 61611AE430993623 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list $STD apt-get update fi From b58ae2b8924b554a9d4fcd404f3dede9c6ed3ba8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 15:22:55 -0500 Subject: [PATCH 36/56] Update mqtt-install.sh go back to basic install --- install/mqtt-install.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/install/mqtt-install.sh b/install/mqtt-install.sh index c9c9c164..18362faa 100644 --- a/install/mqtt-install.sh +++ b/install/mqtt-install.sh @@ -21,15 +21,6 @@ $STD apt-get install -y gpg msg_ok "Installed Dependencies" msg_info "Installing Mosquitto MQTT Broker" -if [ "$PCT_OSTYPE" == "debian" ]; then - VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" - # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc - # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list - gpg --keyserver keyserver.ubuntu.com --recv-keys 61611AE430993623 >/dev/null 2>&1 - gpg --export 61611AE430993623 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1 - echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list - $STD apt-get update -fi $STD apt-get -y install mosquitto $STD apt-get -y install mosquitto-clients cat </etc/mosquitto/conf.d/default.conf From 78bc2006bc1519a3aef51f2d51daaf0606fc5922 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 17:09:11 -0500 Subject: [PATCH 37/56] Update post-pve-install.sh Requires Proxmox Virtual Environment Version 8.1.1 or later. --- misc/post-pve-install.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/misc/post-pve-install.sh b/misc/post-pve-install.sh index ad2227a1..ea166360 100644 --- a/misc/post-pve-install.sh +++ b/misc/post-pve-install.sh @@ -46,7 +46,6 @@ msg_error() { start_routines() { header_info - VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SOURCES" --menu "The package manager will use the correct sources to update and install packages on your Proxmox VE server.\n \nCorrect Proxmox VE sources?" 14 58 2 \ "yes" " " \ @@ -55,10 +54,11 @@ start_routines() { yes) msg_info "Correcting Proxmox VE Sources" cat </etc/apt/sources.list -deb http://ftp.debian.org/debian ${VERSION} main contrib -deb http://ftp.debian.org/debian ${VERSION}-updates main contrib -deb http://security.debian.org/debian-security ${VERSION}-security main contrib +deb http://deb.debian.org/debian bookworm main contrib +deb http://deb.debian.org/debian bookworm-updates main contrib +deb http://security.debian.org/debian-security bookworm-security main contrib EOF +echo 'APT::Get::Update::SourceListWarnings::NonFreeFirmware "false";' >/etc/apt/apt.conf.d/no-bookworm-firmware.conf msg_ok "Corrected Proxmox VE Sources" ;; no) @@ -73,7 +73,7 @@ EOF yes) msg_info "Disabling 'pve-enterprise' repository" cat </etc/apt/sources.list.d/pve-enterprise.list -# deb https://enterprise.proxmox.com/debian/pve ${VERSION} pve-enterprise +# deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise EOF msg_ok "Disabled 'pve-enterprise' repository" ;; @@ -89,7 +89,7 @@ EOF yes) msg_info "Enabling 'pve-no-subscription' repository" cat </etc/apt/sources.list.d/pve-install-repo.list -deb http://download.proxmox.com/debian/pve ${VERSION} pve-no-subscription +deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription EOF msg_ok "Enabled 'pve-no-subscription' repository" ;; @@ -98,7 +98,6 @@ EOF ;; esac - if [[ "${VERSION}" == "bookworm" ]]; then CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CEPH PACKAGE REPOSITORIES" --menu "The 'Ceph Package Repositories' provides access to both the 'no-subscription' and 'enterprise' repositories (initially disabled).\n \nCorrect 'ceph package sources?" 14 58 2 \ "yes" " " \ "no" " " 3>&2 2>&1 1>&3) @@ -117,7 +116,6 @@ EOF msg_error "Selected no to Correcting 'ceph package repositories'" ;; esac - fi CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PVETEST" --menu "The 'pvetest' repository can give advanced users access to new features and updates before they are officially released.\n \nAdd (Disabled) 'pvetest' repository?" 14 58 2 \ "yes" " " \ @@ -126,7 +124,7 @@ EOF yes) msg_info "Adding 'pvetest' repository and set disabled" cat </etc/apt/sources.list.d/pvetest-for-beta.list -# deb http://download.proxmox.com/debian/pve ${VERSION} pvetest +# deb http://download.proxmox.com/debian/pve bookworm pvetest EOF msg_ok "Added 'pvetest' repository" ;; @@ -233,9 +231,11 @@ while true; do esac done -if ! command -v pveversion >/dev/null 2>&1; then - header_info - msg_error "\n No PVE Detected!\n" +if ! pveversion | grep -Eq "pve-manager/(8.1.[1-9])"; then + msg_error "This version of Proxmox Virtual Environment is not supported" + echo -e "Requires Proxmox Virtual Environment Version 8.1.1 or later." + echo -e "Exiting..." + sleep 2 exit fi From 4ea5186921dd846dab6582c71e6d534bcdecf0cf Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 8 Mar 2024 17:12:21 -0500 Subject: [PATCH 38/56] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfb16224..76d301a4 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-03-08 + +### Changed + +- **Proxmox VE Post Install** + - Requires Proxmox Virtual Environment Version 8.1.1 or later. + ## 2024-02-26 ### Changed From b12a98e5a3e647217bb481342041ae9ea6958eb1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 9 Mar 2024 12:03:52 -0500 Subject: [PATCH 39/56] Update build.func remove Lunar, add Mantic --- misc/build.func | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/build.func b/misc/build.func index 604b0468..f21ad361 100644 --- a/misc/build.func +++ b/misc/build.func @@ -205,7 +205,7 @@ advanced_settings() { if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 3 \ "20.04" "Focal" OFF \ "22.04" "Jammy" OFF \ - "23.04" "Lunar" OFF \ + "23.10" "Mantic" OFF \ 3>&1 1>&2 2>&3); then if [ -n "$var_version" ]; then echo -e "${DGN}Using $var_os Version: ${BGN}$var_version${CL}" From e5010e747b8fea9b9b94024050bd2ab635ab2a20 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 11 Mar 2024 07:10:39 -0400 Subject: [PATCH 40/56] Update n8n-install.sh Set environment option "N8N_SECURE_COOKIE=false" --- install/n8n-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/n8n-install.sh b/install/n8n-install.sh index 13aa5104..32298692 100644 --- a/install/n8n-install.sh +++ b/install/n8n-install.sh @@ -44,6 +44,7 @@ Description=n8n [Service] Type=simple +Environment="N8N_SECURE_COOKIE=false" ExecStart=n8n start [Install] WantedBy=multi-user.target From 8e71d636efbe44d8a7fedb017762fdf4aec485fa Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 11 Mar 2024 07:15:41 -0400 Subject: [PATCH 41/56] Update n8n.sh add storage --- ct/n8n.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/n8n.sh b/ct/n8n.sh index 5c5feeae..3abc7328 100644 --- a/ct/n8n.sh +++ b/ct/n8n.sh @@ -20,7 +20,7 @@ EOF header_info echo -e "Loading..." APP="n8n" -var_disk="3" +var_disk="6" var_cpu="2" var_ram="2048" var_os="debian" From afb664eadc91e79c102c1135af279aa392bc4ba3 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:59:12 +0100 Subject: [PATCH 42/56] Create a Wastebin LXC (#2640) --- ct/wastebin.sh | 107 ++++++++++++++++++++++++++++++++++++ install/wastebin-install.sh | 65 ++++++++++++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 ct/wastebin.sh create mode 100644 install/wastebin-install.sh diff --git a/ct/wastebin.sh b/ct/wastebin.sh new file mode 100644 index 00000000..be4b5aef --- /dev/null +++ b/ct/wastebin.sh @@ -0,0 +1,107 @@ +#!/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/matze/wastebin + + +function header_info { +clear +cat <<"EOF" + _ __ __ __ _ +| | / /___ ______/ /____ / /_ (_)___ +| | /| / / __ `/ ___/ __/ _ \/ __ \/ / __ \ +| |/ |/ / /_/ (__ ) /_/ __/ /_/ / / / / / +|__/|__/\__,_/____/\__/\___/_.___/_/_/ /_/ + +EOF +} +header_info +echo -e "Loading..." +APP="Wastebin" +var_disk="4" +var_cpu="4" +var_ram="2048" +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/wastebin ]]; 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 Wastebin" +systemctl stop wastebin +msg_ok "Wastebin Stopped" + +msg_info "Updating Wastebin" +RELEASE=$(curl -s https://api.github.com/repos/matze/wastebin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') +cd /opt +if [ -d wastebin_bak ]; then + rm -rf wastebin_bak +fi +mv wastebin wastebin_bak +wget -q "https://github.com/matze/wastebin/archive/refs/tags/${RELEASE}.zip" +unzip -q ${RELEASE}.zip +mv wastebin-${RELEASE} /opt/wastebin +cd /opt/wastebin +cargo update -q +cargo build -q --release +msg_ok "Updated Wastebin" + +msg_info "Starting Wastebin" +systemctl start wastebin +msg_ok "Started Wastebin" + +msg_info "Cleaning Up" +cd /opt +rm -R ${RELEASE}.zip +rm -R wastebin_bak +msg_ok "Cleaned" +msg_ok "Updated Successfully" +exit +} + +start +build_container +description + +msg_info "Setting Container to Normal Resources" +pct set $CTID -cores 2 +msg_ok "Set Container to Normal Resources" + +msg_ok "Completed Successfully!\n" +echo -e "${APP} Setup should be reachable by going to the following URL. + ${BL}http://${IP}:8088${CL} \n" diff --git a/install/wastebin-install.sh b/install/wastebin-install.sh new file mode 100644 index 00000000..5e6827ce --- /dev/null +++ b/install/wastebin-install.sh @@ -0,0 +1,65 @@ +#!/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/matze/wastebin + +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 \ + build-essential \ + curl \ + sudo \ + git \ + make \ + mc +msg_ok "Installed Dependencies" + +msg_info "Installing Rust (Patience)" +$STD bash <(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs) -y +source ~/.cargo/env +msg_ok "Installed Rust" + +RELEASE=$(curl -s https://api.github.com/repos/matze/wastebin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') +wget -q "https://github.com/matze/wastebin/archive/refs/tags/${RELEASE}.zip" +unzip -q ${RELEASE}.zip +mv wastebin-${RELEASE} /opt/wastebin +rm -R ${RELEASE}.zip +cd /opt/wastebin +cargo build -q --release +msg_ok "Installed Wastebin" + +msg_info "Creating Service" +cat </etc/systemd/system/wastebin.service +[Unit] +Description=Start Wastebin Service +After=network.target + +[Service] +User=root +WorkingDirectory=/opt/wastebin +ExecStart=/root/.cargo/bin/cargo run --release --quiet + +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now wastebin.service +msg_ok "Created Service" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From dfb691ebbcd75f16d1f3054d11daca2800ec9776 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 11 Mar 2024 11:04:26 -0400 Subject: [PATCH 43/56] Update wastebin-install.sh maybe I was wrong about `unzip` --- install/wastebin-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wastebin-install.sh b/install/wastebin-install.sh index 5e6827ce..b83bb4fe 100644 --- a/install/wastebin-install.sh +++ b/install/wastebin-install.sh @@ -18,6 +18,7 @@ update_os msg_info "Installing Dependencies (Patience)" $STD apt-get install -y --no-install-recommends \ build-essential \ + unzip \ curl \ sudo \ git \ From f38cfcd00278e4acb94d17e6f242430caff7df22 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 11 Mar 2024 11:42:27 -0400 Subject: [PATCH 44/56] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76d301a4..d45a4eb8 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-03-11 + +### Changed + +- **Wastebin LXC** + - NEW Script + ## 2024-03-08 ### Changed From ee82bc777d93d761c9d154594cb2365b27226d4b Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 11 Mar 2024 11:55:47 -0400 Subject: [PATCH 45/56] Update wastebin-install.sh tweak --- install/wastebin-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wastebin-install.sh b/install/wastebin-install.sh index b83bb4fe..25e5b592 100644 --- a/install/wastebin-install.sh +++ b/install/wastebin-install.sh @@ -31,6 +31,7 @@ $STD bash <(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs) -y source ~/.cargo/env msg_ok "Installed Rust" +msg_info "Installing Wastebin (Patience)" RELEASE=$(curl -s https://api.github.com/repos/matze/wastebin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') wget -q "https://github.com/matze/wastebin/archive/refs/tags/${RELEASE}.zip" unzip -q ${RELEASE}.zip From e15d82fb7c9c2a4cd6988c27c8c28d12747a6a92 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 12:47:31 -0400 Subject: [PATCH 46/56] Update tandoor.sh fix update function --- ct/tandoor.sh | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ct/tandoor.sh b/ct/tandoor.sh index 3dba8b02..29085af5 100644 --- a/ct/tandoor.sh +++ b/ct/tandoor.sh @@ -54,26 +54,25 @@ function default_settings() { } function update_script() { -header_info -if [[ ! -d /opt/tandoor ]]; then - msg_error "No ${APP} Installation Found!"; - exit; -fi -msg_info "Updating ${APP} LXC" -if cd /opt/tandoor && git pull | grep -q 'Already up to date'; then - msg_error "There is currently no update path available." -else + header_info + if [[ ! -d /opt/tandoor ]]; then msg_error "No ${APP} Installation Found!"; exit; fi + if cd /opt/tandoor && git pull | grep -q 'Already up to date'; then + msg_ok "There is currently no update available." + else + msg_info "Updating ${APP} (Patience)" export $(cat /opt/tandoor/.env | grep "^[^#]" | xargs) - /opt/tandoor/bin/pip3 install -r requirements.txt >/dev/null 2>&1 - /opt/tandoor/bin/python3 manage.py migrate >/dev/null 2>&1 - /opt/tandoor/bin/python3 manage.py collectstatic --no-input >/dev/null 2>&1 - /opt/tandoor/bin/python3 manage.py collectstatic_js_reverse >/dev/null 2>&1 + cd /opt/tandoor/ + pip3 install -r requirements.txt >/dev/null 2>&1 + /usr/bin/python3 /opt/tandoor/manage.py migrate >/dev/null 2>&1 + /usr/bin/python3 /opt/tandoor/manage.py collectstatic --no-input >/dev/null 2>&1 + /usr/bin/python3 /opt/tandoor/manage.py collectstatic_js_reverse >/dev/null 2>&1 cd /opt/tandoor/vue yarn install >/dev/null 2>&1 yarn build >/dev/null 2>&1 - sudo systemctl restart gunicorn_tandoor -fi -exit + systemctl restart gunicorn_tandoor + msg_ok "Updated ${APP}" + fi + exit } start From 16070912baccad3e32114bcaff1a0fc34df2b9e5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 19:29:59 -0400 Subject: [PATCH 47/56] Update homeassistant-core-install.sh tweak --- install/homeassistant-core-install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/homeassistant-core-install.sh b/install/homeassistant-core-install.sh index 327c773f..bb0fbba2 100644 --- a/install/homeassistant-core-install.sh +++ b/install/homeassistant-core-install.sh @@ -44,7 +44,7 @@ msg_ok "Installed Dependencies" RELEASE=$(curl -s https://www.python.org/downloads/ | grep -oP 'Download Python \K\d+\.\d+\.\d+' | head -1) -msg_info "Compiling Python ${RELEASE} from its source (Additional Patience)" +msg_info "Compiling Python 3.12 from its source (Additional Patience)" $STD apt-get remove -y python3 $STD apt-get install -y \ checkinstall \ @@ -57,15 +57,16 @@ $STD apt-get install -y \ libc6-dev \ libbz2-dev -wget -qO- https://www.python.org/ftp/python/${RELEASE}/Python-${RELEASE}.tar.xz | tar -xJ -cd Python-${RELEASE} +#wget -qO- https://www.python.org/ftp/python/${RELEASE}/Python-${RELEASE}.tar.xz | tar -xJ +wget -qO- https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tar.xz | tar -xJ +cd Python-3.12.2 $STD ./configure --enable-optimizations $STD make -j $(nproc) $STD make altinstall $STD update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.12 1 cd ~ -rm -rf Python-${RELEASE} -msg_ok "Installed Python ${RELEASE}" +rm -rf Python-3.12.2 +msg_ok "Installed Python 3.12" msg_info "Installing Home Assistant-Core" mkdir /srv/homeassistant From 47769455a7495d2fca6f88f772f6c0b86fd1019e Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 19:35:15 -0400 Subject: [PATCH 48/56] Update homeassistant-core-install.sh tweak --- install/homeassistant-core-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/homeassistant-core-install.sh b/install/homeassistant-core-install.sh index bb0fbba2..99027611 100644 --- a/install/homeassistant-core-install.sh +++ b/install/homeassistant-core-install.sh @@ -42,7 +42,7 @@ $STD apt-get install -y \ libatlas-base-dev msg_ok "Installed Dependencies" -RELEASE=$(curl -s https://www.python.org/downloads/ | grep -oP 'Download Python \K\d+\.\d+\.\d+' | head -1) +#RELEASE=$(curl -s https://www.python.org/downloads/ | grep -oP 'Download Python \K\d+\.\d+\.\d+' | head -1) msg_info "Compiling Python 3.12 from its source (Additional Patience)" $STD apt-get remove -y python3 From 74b2a1bf2afe4820d7a21bb6b83087bb4582e494 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 19:58:55 -0400 Subject: [PATCH 49/56] Update homeassistant-core.sh tweak --- ct/homeassistant-core.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index 738e2ea1..8c926968 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -20,8 +20,8 @@ header_info echo -e "Loading..." APP="Home Assistant-Core" var_disk="8" -var_cpu="2" -var_ram="1024" +var_cpu="4" +var_ram="2048" var_os="debian" var_version="12" variables @@ -147,6 +147,11 @@ WantedBy=default.target" >$service_path fi } +msg_info "Setting Container to Normal Resources" +pct set $CTID -memory 1024 +pct set $CTID -cores 2 +msg_ok "Set Container to Normal Resources" + start build_container description From 89da288a7f01ffdc716b3308ce0400718ca773d5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 20:33:47 -0400 Subject: [PATCH 50/56] Update homeassistant-core.sh tweak --- ct/homeassistant-core.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index 8c926968..d56ba5a1 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -147,15 +147,15 @@ WantedBy=default.target" >$service_path fi } +start +build_container +description + msg_info "Setting Container to Normal Resources" pct set $CTID -memory 1024 pct set $CTID -cores 2 msg_ok "Set Container to Normal Resources" -start -build_container -description - msg_ok "Completed Successfully!\n" echo -e "${APP} should be reachable by going to the following URL. ${BL}http://${IP}:8123${CL}" From e2bb08fcf722121d50a9476076d893594015ce58 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 12 Mar 2024 20:36:08 -0400 Subject: [PATCH 51/56] Update homeassistant-core.sh tweak --- ct/homeassistant-core.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index d56ba5a1..738e2ea1 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -20,8 +20,8 @@ header_info echo -e "Loading..." APP="Home Assistant-Core" var_disk="8" -var_cpu="4" -var_ram="2048" +var_cpu="2" +var_ram="1024" var_os="debian" var_version="12" variables @@ -151,11 +151,6 @@ start build_container description -msg_info "Setting Container to Normal Resources" -pct set $CTID -memory 1024 -pct set $CTID -cores 2 -msg_ok "Set Container to Normal Resources" - msg_ok "Completed Successfully!\n" echo -e "${APP} should be reachable by going to the following URL. ${BL}http://${IP}:8123${CL}" From 46cc3fe9856ce546b1c7c00553efba7d321ad486 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 13 Mar 2024 04:24:42 -0400 Subject: [PATCH 52/56] Create flowiseai-install.sh --- install/flowiseai-install.sh | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 install/flowiseai-install.sh diff --git a/install/flowiseai-install.sh b/install/flowiseai-install.sh new file mode 100644 index 00000000..04e97500 --- /dev/null +++ b/install/flowiseai-install.sh @@ -0,0 +1,57 @@ +#!/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 Node.js" +mkdir -p /etc/apt/keyrings +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +$STD apt-get update +$STD apt-get install -y nodejs +msg_ok "Installed Node.js" + +msg_info "Installing FlowiseAI (Patience)" +$STD npm install -g flowise +msg_ok "Installed FlowiseAI" + +msg_info "Creating Service" +cat </etc/systemd/system/flowise.service +[Unit] +Description=FlowiseAI +After=network.target + +[Service] +ExecStart=npx flowise start +Restart=always + +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now flowise.service +msg_ok "Created Service" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From 80b2392f8e120ae7094396d91769d913b7ad9990 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 13 Mar 2024 04:26:51 -0400 Subject: [PATCH 53/56] Create flowiseai.sh --- ct/flowiseai.sh | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 ct/flowiseai.sh diff --git a/ct/flowiseai.sh b/ct/flowiseai.sh new file mode 100644 index 00000000..42c70fdd --- /dev/null +++ b/ct/flowiseai.sh @@ -0,0 +1,72 @@ +#!/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="FlowiseAI" +var_disk="10" +var_cpu="2" +var_ram="2048" +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 [[ ! -f /etc/systemd/system/flowise.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +msg_info "Updating ${APP}" +systemctl stop flowise +npm install -g flowise --upgrade +systemctl start flowise +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}:3000${CL} \n" From e8fcc7ec3d77257774ed02cd99b5c8d61bd810ce Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 13 Mar 2024 04:55:12 -0400 Subject: [PATCH 54/56] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d45a4eb8..d20067ea 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-03-13 + +### Changed + +- **FlowiseAI LXC** + - NEW Script + ## 2024-03-11 ### Changed From 6a77af66a49fd644ecce879cf4993611db77dcff Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 13 Mar 2024 06:57:42 -0400 Subject: [PATCH 55/56] Update flowiseai-install.sh test --- install/flowiseai-install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/flowiseai-install.sh b/install/flowiseai-install.sh index 04e97500..0ac6e298 100644 --- a/install/flowiseai-install.sh +++ b/install/flowiseai-install.sh @@ -30,6 +30,8 @@ msg_ok "Installed Node.js" msg_info "Installing FlowiseAI (Patience)" $STD npm install -g flowise +mkdir -p /opt/flowiseai +wget -q https://raw.githubusercontent.com/FlowiseAI/Flowise/main/packages/server/.env.example -O /opt/flowiseai/.env msg_ok "Installed FlowiseAI" msg_info "Creating Service" @@ -39,6 +41,7 @@ Description=FlowiseAI After=network.target [Service] +EnvironmentFile=/opt/flowiseai/.env ExecStart=npx flowise start Restart=always From 58b75e0dd8096ea4225e1c1ba8de2bd32a7d86f6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 13 Mar 2024 17:40:53 -0400 Subject: [PATCH 56/56] Update dashy.sh fix update --- ct/dashy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ct/dashy.sh b/ct/dashy.sh index 23a28334..b06a3955 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -63,11 +63,11 @@ msg_ok "Stopped ${APP}" msg_info "Backing up conf.yml" cd ~ -cp -R /dashy/public/conf.yml conf.yml +cp -R /opt/dashy/public/conf.yml conf.yml msg_ok "Backed up conf.yml" msg_info "Updating Dashy" -cd /dashy +cd /opt/dashy git merge &>/dev/null git pull origin master &>/dev/null yarn &>/dev/null @@ -76,7 +76,7 @@ msg_ok "Updated Dashy" msg_info "Restoring conf.yml" cd ~ -cp -R conf.yml /dashy/public +cp -R conf.yml /opt/dashy/public msg_ok "Restored conf.yml" msg_info "Cleaning"