NginxProxymanager: set Certbot version in npm.service environment variable (2.15.0)

CHANGELOG.md

@@ -472,12 +472,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ## 2026-06-01
 
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - [FileFlows] Fix service handling by using systemctl --all with quoted glob [@adrianmusante](https://github.com/adrianmusante) ([#14838](https://github.com/community-scripts/ProxmoxVE/pull/14838))
-
 ## 2026-05-31
 
 ### 🚀 Updated Scripts

ct/fileflows.sh

@@ -34,7 +34,7 @@ function update_script() {
   update_available=$(curl -fsSL -X 'GET' "http://localhost:19200/api/status/update-available" -H 'accept: application/json' | jq .UpdateAvailable)
   if [[ "${update_available}" == "true" ]]; then
     msg_info "Stopping Service"
-    systemctl --all stop 'fileflows*'
+    systemctl stop fileflows*
     msg_info "Stopped Service"
 
     msg_info "Creating Backup"
@@ -46,7 +46,7 @@ function update_script() {
     fetch_and_deploy_from_url "https://fileflows.com/downloads/zip" "/opt/fileflows"
 
     msg_info "Starting Service"
-    systemctl --all start 'fileflows*'
+    systemctl start fileflows*
     msg_ok "Started Service"
     msg_ok "Updated successfully!"
   else

ct/fireshare.sh

@@ -53,12 +53,6 @@ function update_script() {
     export VIDEO_DIRECTORY=/opt/fireshare-videos
     export PROCESSED_DIRECTORY=/opt/fireshare-processed
     $STD uv run flask db upgrade
-
-    msg_info "Building Fireshare Client"
-    cd /opt/fireshare/app/client
-    $STD npm install
-    $STD npm run build
-    msg_ok "Built Fireshare Client"
     msg_ok "Updated Fireshare"
 
     msg_info "Starting Service"

ct/nginxproxymanager.sh

@@ -216,6 +216,12 @@ EOF
     msg_ok "Initialized Backend"
 
     msg_info "Starting Services"
+    CERTBOT_VER=$(/opt/certbot/bin/certbot --version 2>&1 | awk '{print $NF}')
+    if grep -q "Environment=CERTBOT_VERSION" /lib/systemd/system/npm.service; then
+      sed -i "s|Environment=CERTBOT_VERSION=.*|Environment=CERTBOT_VERSION=${CERTBOT_VER}|" /lib/systemd/system/npm.service
+    else
+      sed -i "/Environment=NODE_ENV=production/a Environment=CERTBOT_VERSION=${CERTBOT_VER}" /lib/systemd/system/npm.service
+    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
     systemctl daemon-reload

ct/odoo.sh

@@ -20,22 +20,6 @@ variables
 color
 catch_errors
 
-ensure_lxml_html_clean() {
-  ensure_dependencies python3-lxml
-  if apt-cache show python3-lxml-html-clean &>/dev/null; then
-    ensure_dependencies python3-lxml-html-clean
-  else
-    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
-    $STD dpkg -i /opt/python3-lxml-html-clean.deb
-    $STD apt-get install -f -y
-    rm -f /opt/python3-lxml-html-clean.deb
-  fi
-  if ! python3 -c "import lxml_html_clean; from lxml.html import clean" 2>/dev/null; then
-    msg_error "lxml.html.clean is not available (python3-lxml-html-clean required)"
-    exit 1
-  fi
-}
-
 function update_script() {
   header_info
   check_container_storage
@@ -45,7 +29,12 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  ensure_lxml_html_clean
+  ensure_dependencies python3-lxml
+  if ! [[ $(dpkg -s python3-lxml-html-clean 2>/dev/null) ]]; then
+    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
+    $STD dpkg -i /opt/python3-lxml-html-clean.deb
+    rm -f /opt/python3-lxml-html-clean.deb
+  fi
 
   RELEASE=$(curl -fsSL https://nightly.odoo.com/ | grep -oE 'href="[0-9]+\.[0-9]+/nightly"' | head -n1 | cut -d'"' -f2 | cut -d/ -f1)
   LATEST_VERSION=$(curl -fsSL "https://nightly.odoo.com/${RELEASE}/nightly/deb/" |
@@ -62,7 +51,6 @@ function update_script() {
     msg_info "Updating ${APP} to ${LATEST_VERSION}"
     curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
     $STD apt install -y /opt/odoo.deb
-    ensure_lxml_html_clean
     rm -f /opt/odoo.deb
     echo "$LATEST_VERSION" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${LATEST_VERSION}"

install/nginxproxymanager-install.sh

@@ -160,7 +160,8 @@ $STD yarn install --network-timeout 600000
 msg_ok "Initialized Backend"
 
 msg_info "Creating Service"
-cat <<'EOF' >/lib/systemd/system/npm.service
+CERTBOT_VER=$(/opt/certbot/bin/certbot --version 2>&1 | awk '{print $NF}')
+cat <<EOF >/lib/systemd/system/npm.service
 [Unit]
 Description=Nginx Proxy Manager
 After=network.target
@@ -169,6 +170,7 @@ Wants=openresty.service
 [Service]
 Type=simple
 Environment=NODE_ENV=production
+Environment=CERTBOT_VERSION=${CERTBOT_VER}
 ExecStartPre=-mkdir -p /tmp/nginx/body /data/letsencrypt-acme-challenge
 ExecStart=/usr/bin/node index.js --abort_on_uncaught_exception --max_old_space_size=250
 WorkingDirectory=/app

install/odoo-install.sh

@@ -13,25 +13,10 @@ setting_up_container
 network_check
 update_os
 
-ensure_lxml_html_clean() {
-  ensure_dependencies python3-lxml
-  if apt-cache show python3-lxml-html-clean &>/dev/null; then
-    ensure_dependencies python3-lxml-html-clean
-  else
-    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
-    $STD dpkg -i /opt/python3-lxml-html-clean.deb
-    $STD apt-get install -f -y
-    rm -f /opt/python3-lxml-html-clean.deb
-  fi
-  if ! python3 -c "import lxml_html_clean; from lxml.html import clean" 2>/dev/null; then
-    msg_error "lxml.html.clean is not available (python3-lxml-html-clean required)"
-    exit 1
-  fi
-}
-
 msg_info "Installing Dependencies"
-$STD apt install -y wkhtmltopdf
-ensure_lxml_html_clean
+$STD apt install -y python3-lxml wkhtmltopdf
+curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
+$STD dpkg -i /opt/python3-lxml-html-clean.deb
 msg_ok "Installed Dependencies"
 
 PG_VERSION="18" setup_postgresql
@@ -46,7 +31,6 @@ LATEST_VERSION=$(curl -fsSL "https://nightly.odoo.com/${RELEASE}/nightly/deb/" |
 msg_info "Setup Odoo $RELEASE"
 curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
 $STD apt install -y /opt/odoo.deb
-ensure_lxml_html_clean
 msg_ok "Setup Odoo $RELEASE"
 
 msg_info "Setup PostgreSQL Database"
@@ -75,6 +59,7 @@ sed -i \
   /etc/odoo/odoo.conf
 $STD sudo -u odoo odoo -c /etc/odoo/odoo.conf -d odoo -i base --stop-after-init
 rm -f /opt/odoo.deb
+rm -f /opt/python3-lxml-html-clean.deb
 echo "${LATEST_VERSION}" >/opt/${APPLICATION}_version.txt
 msg_ok "Configured Odoo"