From 7d77be87d517a48d3a8cfda68acc71c90263cd7f Mon Sep 17 00:00:00 2001 From: kabroxiko Date: Sat, 24 Aug 2024 08:24:06 -0400 Subject: [PATCH 01/29] Update plex-install.sh (#3580) - install gpg to avoid plexupdate warning --- install/plex-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/plex-install.sh b/install/plex-install.sh index 1ca8b0d91..d456be026 100644 --- a/install/plex-install.sh +++ b/install/plex-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 gpg msg_ok "Installed Dependencies" msg_info "Setting Up Hardware Acceleration" From 21abd0905255fa3992dfef156c816faf9f583049 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 09:15:31 -0400 Subject: [PATCH 02/29] Update wireguard-install.sh configure Network Address Translation --- install/wireguard-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index e1b470fc3..4b7755454 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,10 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables +$STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables-persistent +iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE +$STD netfilter-persistent save +$STD netfilter-persistent reload msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 2281a20b756ad8a1c4d7dc7f7fcfc5add2633766 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 09:47:37 -0400 Subject: [PATCH 03/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 4b7755454..b737c8681 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables-persistent +$STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE $STD netfilter-persistent save $STD netfilter-persistent reload From d5e66a25ff537e3d664146b8e0c75c73bbd77b04 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 09:52:59 -0400 Subject: [PATCH 04/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index b737c8681..de6c53f24 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables +$STD apt-get install -y wireguard wireguard-tools net-tools iptables netfilter-persistent iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE $STD netfilter-persistent save $STD netfilter-persistent reload From 4844a003161bed7b5e63d3273e0c4c11f26d6b5b Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 10:08:27 -0400 Subject: [PATCH 05/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index de6c53f24..f0e98eabb 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,10 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables netfilter-persistent -iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE -$STD netfilter-persistent save -$STD netfilter-persistent reload +$STD DEBIAN_FRONTEND=noninteractive apt-get install -y wireguard wireguard-tools net-tools iptables iptables-persistent msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From fef858ed7b9767be907466fd2b63d0be7e24854e Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 10:12:57 -0400 Subject: [PATCH 06/29] Update wireguard-install.sh revert changes --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index f0e98eabb..e1b470fc3 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD DEBIAN_FRONTEND=noninteractive apt-get install -y wireguard wireguard-tools net-tools iptables iptables-persistent +$STD apt-get install -y wireguard wireguard-tools net-tools iptables msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 9d76662d76cc0772b2c99ae8c2e0f15db8d4475c Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 10:26:56 -0400 Subject: [PATCH 07/29] Update wireguard-install.sh try again to configure Network Address Translation --- install/wireguard-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index e1b470fc3..b647cc496 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -22,6 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Installing WireGuard" $STD apt-get install -y wireguard wireguard-tools net-tools iptables +$STD DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 9ad778ca52455573d70409dca966cfd22eb9ecc6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 10:38:08 -0400 Subject: [PATCH 08/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index b647cc496..b34a8979c 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -22,7 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Installing WireGuard" $STD apt-get install -y wireguard wireguard-tools net-tools iptables -$STD DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent +DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 3fc4aa4a6e71b79c8c60a6b15463941c53bad057 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 10:48:37 -0400 Subject: [PATCH 09/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index b34a8979c..c80d4fe15 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -23,6 +23,7 @@ msg_ok "Installed Dependencies" msg_info "Installing WireGuard" $STD apt-get install -y wireguard wireguard-tools net-tools iptables DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null +$STD netfilter-persistent reload msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 253da053feff9c39142a58391eac08ccb6aa88f5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Aug 2024 11:02:04 -0400 Subject: [PATCH 10/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index c80d4fe15..1b12dfbf5 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -22,6 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Installing WireGuard" $STD apt-get install -y wireguard wireguard-tools net-tools iptables +iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null $STD netfilter-persistent reload msg_ok "Installed WireGuard" From 158c309d71cb99e075eb23eb08855596cb8990b7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Aug 2024 11:28:46 -0400 Subject: [PATCH 11/29] Update jellyfin-install.sh https://github.com/tteck/Proxmox/issues/3592 --- install/jellyfin-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh index 0b91e0608..473c6b129 100644 --- a/install/jellyfin-install.sh +++ b/install/jellyfin-install.sh @@ -16,7 +16,7 @@ update_os msg_info "Installing Dependencies" $STD apt-get install -y curl $STD apt-get install -y sudo -$STD apt-get install -y gnupg +$STD apt-get install -y gpg $STD apt-get install -y mc msg_ok "Installed Dependencies" @@ -51,6 +51,7 @@ EOF # Install Jellyfin using the metapackage (which will fetch jellyfin-server, jellyfin-web, and jellyfin-ffmpeg5) $STD apt-get update $STD apt-get install -y jellyfin +chown -R jellyfin:adm /etc/jellyfin if [[ "$CTTYPE" == "0" ]]; then sed -i -e 's/^ssl-cert:x:104:$/render:x:104:root,jellyfin/' -e 's/^render:x:108:root,jellyfin$/ssl-cert:x:108:/' /etc/group else From df3047e295cb7ef18f1362ef41a6b77534c4e40a Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Aug 2024 11:35:08 -0400 Subject: [PATCH 12/29] Update jellyfin-install.sh tweak --- install/jellyfin-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh index 473c6b129..e9d15dbae 100644 --- a/install/jellyfin-install.sh +++ b/install/jellyfin-install.sh @@ -52,6 +52,7 @@ EOF $STD apt-get update $STD apt-get install -y jellyfin chown -R jellyfin:adm /etc/jellyfin +systemctl restart jellyfin if [[ "$CTTYPE" == "0" ]]; then sed -i -e 's/^ssl-cert:x:104:$/render:x:104:root,jellyfin/' -e 's/^render:x:108:root,jellyfin$/ssl-cert:x:108:/' /etc/group else From 4696040e93a57ef79f86d0198dcdc60ae2ad4ae3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 28 Aug 2024 11:42:30 -0400 Subject: [PATCH 13/29] Update jellyfin-install.sh tweak --- install/jellyfin-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh index e9d15dbae..590b9cd26 100644 --- a/install/jellyfin-install.sh +++ b/install/jellyfin-install.sh @@ -52,6 +52,7 @@ EOF $STD apt-get update $STD apt-get install -y jellyfin chown -R jellyfin:adm /etc/jellyfin +sleep 10 systemctl restart jellyfin if [[ "$CTTYPE" == "0" ]]; then sed -i -e 's/^ssl-cert:x:104:$/render:x:104:root,jellyfin/' -e 's/^render:x:108:root,jellyfin$/ssl-cert:x:108:/' /etc/group From 96c80624056a063a2d90aeab24963ad5612d830e Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 30 Aug 2024 11:41:17 -0400 Subject: [PATCH 14/29] Update frigate.sh To update Frigate, create a new container and transfer your configuration. --- ct/frigate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/frigate.sh b/ct/frigate.sh index f34830138..0e83c6e04 100644 --- a/ct/frigate.sh +++ b/ct/frigate.sh @@ -55,7 +55,7 @@ function default_settings() { function update_script() { if [[ ! -f /etc/systemd/system/frigate.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi - msg_error "There is currently no update path available." + msg_error "To update Frigate, create a new container and transfer your configuration." exit } From 6cb0bc59d9f177a99c77ccdd395403240cd077ea Mon Sep 17 00:00:00 2001 From: cmar7945 <95606075+cmar7945@users.noreply.github.com> Date: Sat, 31 Aug 2024 06:07:22 -0400 Subject: [PATCH 15/29] Update mikrotik-routeros.sh (#3629) Update the ZIP extracted from 7.15.2 to 7.15.3, keeping it up to date in the stable branch of the routerOS --- vm/mikrotik-routeros.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/mikrotik-routeros.sh b/vm/mikrotik-routeros.sh index 29b41892d..4b0978fa3 100644 --- a/vm/mikrotik-routeros.sh +++ b/vm/mikrotik-routeros.sh @@ -234,7 +234,7 @@ msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location." msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}." msg_info "Getting URL for Mikrotik RouterOS CHR Disk Image" -URL=https://download.mikrotik.com/routeros/7.15.2/chr-7.15.2.img.zip +URL=https://download.mikrotik.com/routeros/7.15.3/chr-7.15.3.img.zip sleep 2 msg_ok "${CL}${BL}${URL}${CL}" From 7f66b187fdc3985a76073d6c07b6b32aa501c717 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 31 Aug 2024 11:19:08 -0400 Subject: [PATCH 16/29] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd304c7d8..59bb88110 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@

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

-> [!WARNING] +> [!CAUTION] 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 75c98d8e68a2119f4465b26ed676a3f0d6455c6c Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 31 Aug 2024 11:20:17 -0400 Subject: [PATCH 17/29] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27957012c..02317c52b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ --- -> [!WARNING] +> [!CAUTION] 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/. These scripts empower users to create a Linux container or virtual machine interactively, providing choices for both simple and advanced configurations. The basic setup adheres to default settings, while the advanced setup gives users the ability to customize these defaults. From c9e271dac79ac88862ca050d30d5a067bdd3ab80 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 31 Aug 2024 12:29:04 -0400 Subject: [PATCH 18/29] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59bb88110..3d9428aad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ > [!CAUTION] 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. +> [!NOTE] +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. ## 2024-08-21 From e680dab28fd506e8ad0624275035c4fcb7ec48e8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 1 Sep 2024 06:02:16 -0400 Subject: [PATCH 19/29] Update mariadb-install.sh fixes https://github.com/tteck/Proxmox/issues/3635 --- install/mariadb-install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/install/mariadb-install.sh b/install/mariadb-install.sh index 46ecf9df3..c0d67cab2 100644 --- a/install/mariadb-install.sh +++ b/install/mariadb-install.sh @@ -20,8 +20,6 @@ $STD apt-get install -y mc msg_ok "Installed Dependencies" msg_info "Installing MariaDB" -$STD bash <(curl -fsSL https://r.mariadb.com/downloads/mariadb_repo_setup) -$STD apt-get update $STD apt-get install -y mariadb-server 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 From cb8318bf089e9521767824b71c8dab3408193aaa Mon Sep 17 00:00:00 2001 From: Amir <48432425+amirbouraoui@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:40:29 +0200 Subject: [PATCH 20/29] Update wireguard-install.sh adding `resolvconf` (#3642) --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 1b12dfbf5..da82e6eab 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables +$STD apt-get install -y wireguard wireguard-tools net-tools iptables resolvconf iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null $STD netfilter-persistent reload From 030d477cc35e7ec2a550f84f2a81da2ff5f47e51 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 2 Sep 2024 11:36:21 -0400 Subject: [PATCH 21/29] Update wireguard-install.sh test --- install/wireguard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index da82e6eab..1b12dfbf5 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Installing WireGuard" -$STD apt-get install -y wireguard wireguard-tools net-tools iptables resolvconf +$STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null $STD netfilter-persistent reload From f23b3cea1356c0b9860272a71d6160fdaf3eb2a0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 2 Sep 2024 11:51:54 -0400 Subject: [PATCH 22/29] Update wireguard-install.sh tweak --- install/wireguard-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 1b12dfbf5..12d811f4a 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -25,6 +25,7 @@ $STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null $STD netfilter-persistent reload +$STD apt-get install -y resolvconf msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From 2d6f2d0e94e3d781e04a1133a7436f493a69e8d7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 2 Sep 2024 11:56:17 -0400 Subject: [PATCH 23/29] Update wireguard-install.sh revert tweak --- install/wireguard-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 12d811f4a..1b12dfbf5 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -25,7 +25,6 @@ $STD apt-get install -y wireguard wireguard-tools net-tools iptables iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -y iptables-persistent &>/dev/null $STD netfilter-persistent reload -$STD apt-get install -y resolvconf msg_ok "Installed WireGuard" msg_info "Installing WGDashboard" From ef55baf25a3dae46fa9d8a86f77a1185b0d03591 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 2 Sep 2024 11:59:20 -0400 Subject: [PATCH 24/29] Revert "Update wireguard-install.sh adding `resolvconf` (#3642)" (#3645) This reverts commit cb8318bf089e9521767824b71c8dab3408193aaa. From c926ed1fbcf20a27ca80120a16c4a9767bd5ee40 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 3 Sep 2024 10:54:34 -0400 Subject: [PATCH 25/29] Update prometheus-install.sh tweak --- install/prometheus-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/prometheus-install.sh b/install/prometheus-install.sh index 5d2e95cdd..7f939a42a 100644 --- a/install/prometheus-install.sh +++ b/install/prometheus-install.sh @@ -23,8 +23,8 @@ msg_info "Installing Prometheus" RELEASE=$(curl -s https://api.github.com/repos/prometheus/prometheus/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') mkdir -p /etc/prometheus mkdir -p /var/lib/prometheus -$STD wget https://github.com/prometheus/prometheus/releases/download/v${RELEASE}/prometheus-${RELEASE}.linux-amd64.tar.gz -$STD tar -xvf prometheus-${RELEASE}.linux-amd64.tar.gz +wget -q https://github.com/prometheus/prometheus/releases/download/v${RELEASE}/prometheus-${RELEASE}.linux-amd64.tar.gz +tar -xf prometheus-${RELEASE}.linux-amd64.tar.gz cd prometheus-${RELEASE}.linux-amd64 mv prometheus promtool /usr/local/bin/ mv consoles/ console_libraries/ /etc/prometheus/ @@ -51,7 +51,7 @@ ExecStart=/usr/local/bin/prometheus \ [Install] WantedBy=multi-user.target" >$service_path -$STD sudo systemctl enable --now prometheus +systemctl enable -q --now prometheus msg_ok "Created Service" motd_ssh From 86a5c8c1bad405c401ba3da04ec00c423fb112a4 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 3 Sep 2024 14:14:02 -0400 Subject: [PATCH 26/29] Update ubuntu2404-vm.sh tweak --- vm/ubuntu2404-vm.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/vm/ubuntu2404-vm.sh b/vm/ubuntu2404-vm.sh index c3dd17502..920af0194 100644 --- a/vm/ubuntu2404-vm.sh +++ b/vm/ubuntu2404-vm.sh @@ -142,7 +142,6 @@ function default_settings() { MAC="$GEN_MAC" VLAN="" MTU="" - START_VM="no" echo -e "${DGN}Using Virtual Machine ID: ${BGN}${VMID}${CL}" echo -e "${DGN}Using Machine Type: ${BGN}i440fx${CL}" echo -e "${DGN}Using Disk Cache: ${BGN}None${CL}" @@ -154,7 +153,6 @@ function default_settings() { echo -e "${DGN}Using MAC Address: ${BGN}${MAC}${CL}" echo -e "${DGN}Using VLAN: ${BGN}Default${CL}" echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}" - echo -e "${DGN}Start VM when completed: ${BGN}no${CL}" echo -e "${BL}Creating an Ubuntu 24.04 VM using the above default settings${CL}" } @@ -306,14 +304,6 @@ function advanced_settings() { exit-script fi - if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then - echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}" - START_VM="yes" - else - echo -e "${DGN}Start VM when completed: ${BGN}no${CL}" - START_VM="no" - fi - if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create an Ubuntu 24.04 VM?" --no-button Do-Over 10 58); then echo -e "${RD}Creating an Ubuntu 24.04 VM using the above advanced settings${CL}" else @@ -418,11 +408,6 @@ qm set $VMID \ " >/dev/null msg_ok "Created a Ubuntu 24.04 VM ${CL}${BL}(${HN})" -if [ "$START_VM" == "yes" ]; then - msg_info "Starting Ubuntu 24.04 VM" - qm start $VMID - msg_ok "Started Ubuntu 24.04 VM" -fi msg_ok "Completed Successfully!\n" echo -e "Setup Cloud-Init before starting \n More info at https://github.com/tteck/Proxmox/discussions/2072 \n" From 5fb1be4e41520b248247912ab71c93bb4cecd16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Tue, 3 Sep 2024 15:09:57 -0400 Subject: [PATCH 27/29] Add scripts for Collabora Online (#3648) --- ct/collabora.sh | 71 ++++++++++++++++++++++++++++++++++++ install/collabora-install.sh | 44 ++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 ct/collabora.sh create mode 100644 install/collabora-install.sh diff --git a/ct/collabora.sh b/ct/collabora.sh new file mode 100644 index 000000000..56c3a977b --- /dev/null +++ b/ct/collabora.sh @@ -0,0 +1,71 @@ +#!/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) +# Co-Author: remz1337 +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE + +function header_info { +clear +cat <<"EOF" + ______ ____ __ + / ____/___ / / /___ _/ /_ ____ _________ _ + / / / __ \/ / / __ `/ __ \/ __ \/ ___/ __ `/ +/ /___/ /_/ / / / /_/ / /_/ / /_/ / / / /_/ / +\____/\____/_/_/\__,_/_.___/\____/_/ \__,_/ + +EOF +} +header_info +echo -e "Loading..." +APP="Collabora" +var_disk="12" +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 [[ ! -f /lib/systemd/system/coolwsd.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 ${APP} LXC" + exit +} + +start +build_container +description + +msg_ok "Completed Successfully!\n" +echo -e "${APP} needs to be behind a proxy (Nginx Proxy Manager)." diff --git a/install/collabora-install.sh b/install/collabora-install.sh new file mode 100644 index 000000000..570d6ae80 --- /dev/null +++ b/install/collabora-install.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Copyright (c) 2021-2024 tteck +# Author: tteck (tteckster) +# Co-Author: remz1337 +# 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 +msg_ok "Installed Dependencies" + +msg_info "Installing Collabora Online" +wget -q -O /usr/share/keyrings/collaboraonline-release-keyring.gpg https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg +cat </etc/apt/sources.list.d/collaboraonline.sources +Types: deb +URIs: https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb +Suites: ./ +Signed-By: /usr/share/keyrings/collaboraonline-release-keyring.gpg +EOF +$STD apt update +$STD apt install -y coolwsd code-brand collaboraoffice* +sed -i 's|true|false|g' /etc/coolwsd/coolwsd.xml +sed -i 's|false|true|g' /etc/coolwsd/coolwsd.xml +systemctl restart coolwsd +msg_ok "Installed Collabora Online" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get -y autoremove +$STD apt-get -y autoclean +msg_ok "Cleaned" From 103ac46a9f041dc7272e127aba40ef94ef3a4d25 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 3 Sep 2024 19:58:20 -0400 Subject: [PATCH 28/29] Update prometheus.sh Create update path --- ct/prometheus.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/ct/prometheus.sh b/ct/prometheus.sh index b2230eaae..a602cccd4 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -55,7 +55,30 @@ 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_error "There is currently no update path available." +RELEASE=$(curl -s https://api.github.com/repos/prometheus/prometheus/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') +if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + msg_info "Stopping ${APP}" + systemctl stop prometheus + msg_ok "Stopped ${APP}" + + msg_info "Updating ${APP} to ${RELEASE}" + wget -q https://github.com/prometheus/prometheus/releases/download/v${RELEASE}/prometheus-${RELEASE}.linux-amd64.tar.gz + tar -xf prometheus-${RELEASE}.linux-amd64.tar.gz + cd prometheus-${RELEASE}.linux-amd64 + cp -rf prometheus promtool /usr/local/bin/ + cp -rf consoles/ console_libraries/ /etc/prometheus/ + cd ~ + rm -rf prometheus-${RELEASE}.linux-amd64 prometheus-${RELEASE}.linux-amd64.tar.gz + echo "${RELEASE}" >/opt/${APP}_version.txt + msg_ok "Updated ${APP} to ${RELEASE}" + + msg_info "Starting ${APP}" + systemctl start prometheus + msg_ok "Started ${APP}" + msg_ok "Updated Successfully" +else + msg_ok "No update required. ${APP} is already at ${RELEASE}" +fi exit } From 07895a7c2347f0c784c9855ee93acc3565af9e90 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 3 Sep 2024 19:59:28 -0400 Subject: [PATCH 29/29] Update prometheus-install.sh Add `version.txt` --- install/prometheus-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/prometheus-install.sh b/install/prometheus-install.sh index 7f939a42a..33a0a37ed 100644 --- a/install/prometheus-install.sh +++ b/install/prometheus-install.sh @@ -29,6 +29,7 @@ cd prometheus-${RELEASE}.linux-amd64 mv prometheus promtool /usr/local/bin/ mv consoles/ console_libraries/ /etc/prometheus/ mv prometheus.yml /etc/prometheus/prometheus.yml +echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed Prometheus" msg_info "Creating Service"