From 03963b51935a81c7e0bbd27309f436c429d45c2c Mon Sep 17 00:00:00 2001 From: Sam Heinz Date: Mon, 29 Jun 2026 07:02:08 +1000 Subject: [PATCH] remove: promtail as EOL and other fixes (#15455) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add host-migrate.sh Proxmox VE tool Add tools/pve/host-migrate.sh — an interactive Proxmox VE host migration utility. The script (whiptail UI) can export host configuration, /etc tarball, SSH keys, APT state and LXC/QEMU guests (vzdump or config-only) into a timestamped bundle, with optional on-demand NFS mounting. It also supports importing bundles to restore guests and selective host components (storage, users, SSH, APT, hosts, network, hostname) with explicit warnings for dangerous operations (network/hostname). Implements preflight checks, manifest creation, storage mapping checks, cleanup trap for NFS, and integrates helper functions loaded from the project's core scripts. * Improve storage prep & mounting in host-migrate Add interactive storage preparation and safer mount handling for host-migrate. - Track and clean up on-demand mounts via TEMP_MOUNTS and extend cleanup handler. - Add helpers: _new_mountpoint, _offer_fstab, mount_existing_fs, format_and_mount, create_lv_and_mount to mount, format, or create LVs and optionally persist to /etc/fstab. - Enhance browse_mounts to list unmounted block devices and LVM VGs, offer mount/format/LV creation, and return prepared mount via BROWSE_RESULT. - Integrate prepared target into choose_location and do_export; show free-space warning before export. - Improve vzdump output detection to pick the newest non-log file. - Minor UX/message tweaks and quoting fixes for backup filenames when restoring storage.cfg and /etc/hosts. These changes let users pick or prepare target storage (mount existing FS, format disks, create LVs) interactively and ensures temporary mounts are cleaned up. * fixes for npm, loki, omada, wishlist Remove promtail from loki/alpine-loki Replace node execstart in npm during update add user agent to omada download use pnpm 11 for wishlist * remove Host migrate --------- Co-authored-by: MickLesk Co-authored-by: CanbiZ (MickLesk) <47820557+MickLesk@users.noreply.github.com> --- ct/alpine-loki.sh | 2 -- ct/loki.sh | 15 +-------------- ct/nginxproxymanager.sh | 3 +++ ct/omada.sh | 2 +- ct/wishlist.sh | 2 +- install/alpine-loki-install.sh | 10 ---------- install/loki-install.sh | 8 -------- install/omada-install.sh | 2 +- 8 files changed, 7 insertions(+), 37 deletions(-) diff --git a/ct/alpine-loki.sh b/ct/alpine-loki.sh index d0fb9c648..ee6883646 100644 --- a/ct/alpine-loki.sh +++ b/ct/alpine-loki.sh @@ -58,5 +58,3 @@ msg_ok "Completed successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW}Access it using the following URL:${CL}" echo -e "${GATEWAY}${BGN}http://${IP}:3100${CL}" -echo -e "${INFO}${YW}Access Promtail using the following URL:${CL}" -echo -e "${GATEWAY}${BGN}http://${IP}:9080${CL}" diff --git a/ct/loki.sh b/ct/loki.sh index c1effaf39..2156eac5a 100644 --- a/ct/loki.sh +++ b/ct/loki.sh @@ -31,7 +31,7 @@ function update_script() { fi CHOICE=$(msg_menu "Loki Update Options" \ - "1" "Update Loki & Promtail" \ + "1" "Update Loki" \ "2" "Allow 0.0.0.0 for listening" \ "3" "Allow only ${LOCAL_IP} for listening") @@ -39,24 +39,15 @@ function update_script() { 1) msg_info "Stopping Loki" systemctl stop loki - if systemctl is-active --quiet promtail 2>/dev/null || dpkg -s promtail >/dev/null 2>&1; then - systemctl stop promtail - fi msg_ok "Stopped Loki" msg_info "Updating Loki" $STD apt update $STD apt install -y --only-upgrade loki - if dpkg -s promtail >/dev/null 2>&1; then - $STD apt install -y --only-upgrade promtail - fi msg_ok "Updated Loki" msg_info "Starting Loki" systemctl start loki - if dpkg -s promtail >/dev/null 2>&1; then - systemctl start promtail - fi msg_ok "Started Loki" msg_ok "Updated successfully!" exit @@ -89,7 +80,3 @@ msg_ok "Completed successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access loki using the following URL:${CL}" echo -e "${GATEWAY}${BGN}http://${IP}:3100${CL}\n" -if dpkg -s promtail >/dev/null 2>&1; then - echo -e "${INFO}${YW} Access promtail using the following URL:${CL}" - echo -e "${GATEWAY}${BGN}http://${IP}:9080${CL}" -fi diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 2bcfa34d4..7963ceb84 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -235,6 +235,9 @@ EOF fi sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf sed -r -i 's/^([[:space:]]*)su npm npm/\1#su npm npm/g;' /etc/logrotate.d/nginx-proxy-manager + if [ -n "$(command -v node)" ]; then + sed -i -E "s|^ExecStart=.*/node index\.js|ExecStart=$(command -v node) index.js|" /lib/systemd/system/npm.service + fi systemctl daemon-reload systemctl enable -q --now openresty systemctl enable -q --now npm diff --git a/ct/omada.sh b/ct/omada.sh index e339190f0..0c0c74811 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -39,7 +39,7 @@ function update_script() { JAVA_VERSION="21" setup_java - OMADA_URL=$(curl -fsSL "https://support.omadanetworks.com/en/download/software/omada-controller/" | + OMADA_URL=$(curl -fsSL -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.5 Safari/605.1.15" "https://support.omadanetworks.com/en/download/software/omada-controller/" | grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | head -n1) OMADA_PKG=$(basename "${OMADA_URL}") diff --git a/ct/wishlist.sh b/ct/wishlist.sh index 58a9789ef..4aa4b2153 100644 --- a/ct/wishlist.sh +++ b/ct/wishlist.sh @@ -29,7 +29,7 @@ function update_script() { fi if check_for_gh_release "wishlist" "cmintey/wishlist"; then - NODE_VERSION="24" NODE_MODULE="pnpm" setup_nodejs + NODE_VERSION="24" NODE_MODULE="pnpm@11" setup_nodejs msg_info "Stopping Service" systemctl stop wishlist diff --git a/install/alpine-loki-install.sh b/install/alpine-loki-install.sh index 69869978a..738d3b8d1 100644 --- a/install/alpine-loki-install.sh +++ b/install/alpine-loki-install.sh @@ -71,16 +71,6 @@ $STD rc-update add loki default $STD rc-service loki start msg_ok "Installed Loki" -read -rp "Would you like to install Promtail? (y/N): " INSTALL_PROMTAIL -if [[ "${INSTALL_PROMTAIL,,}" =~ ^(y|yes)$ ]]; then - msg_info "Installing Promtail" - $STD apk add loki-promtail - $STD sed -i '/http_addr/s/127.0.0.1/0.0.0.0/g' /etc/conf.d/loki-promtail - $STD rc-update add loki-promtail default - $STD rc-service loki-promtail start - msg_ok "Installed Promtail" -fi - motd_ssh customize cleanup_lxc diff --git a/install/loki-install.sh b/install/loki-install.sh index 6cdc310ea..a47a5c4e3 100644 --- a/install/loki-install.sh +++ b/install/loki-install.sh @@ -70,14 +70,6 @@ chown loki /etc/loki/config.yml systemctl enable -q --now loki msg_ok "Installed Loki" -read -rp "Would you like to install Promtail? (y/N): " INSTALL_PROMTAIL -if [[ "${INSTALL_PROMTAIL,,}" =~ ^(y|yes)$ ]]; then - msg_info "Installing Promtail" - $STD apt install -y promtail - systemctl enable -q --now promtail - msg_ok "Installed Promtail" -fi - motd_ssh customize cleanup_lxc diff --git a/install/omada-install.sh b/install/omada-install.sh index 64203e155..9b6f42a02 100644 --- a/install/omada-install.sh +++ b/install/omada-install.sh @@ -35,7 +35,7 @@ if ! dpkg -l | grep -q 'libssl1.1'; then fi msg_info "Installing Omada Controller" -OMADA_URL=$(curl -fsSL "https://support.omadanetworks.com/en/download/software/omada-controller/" | +OMADA_URL=$(curl -fsSL -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.5 Safari/605.1.15" "https://support.omadanetworks.com/en/download/software/omada-controller/" | grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | head -n1) OMADA_PKG=$(basename "${OMADA_URL}")