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

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}"

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

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

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}")

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

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

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

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}")