fix: output

ct/nginxproxymanager.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
-# Copyright (c) 2021-2025 tteck
-# Author: tteck (tteckster)
+# Copyright (c) 2021-2025 Community-Script ORG
+# Author: tteck (tteckster) | Co-Author: CrazyWolf13
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://nginxproxymanager.com/
 
 APP="Nginx Proxy Manager"
 var_tags="${var_tags:-proxy}"
 var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-1024}"
-var_disk="${var_disk:-4}"
+var_ram="${var_ram:-2048}"
+var_disk="${var_disk:-8}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
@@ -42,60 +42,47 @@ function update_script() {
   fi
 
   NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
-  export NODE_OPTIONS="--openssl-legacy-provider"
 
   RELEASE=$(curl -fsSL https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest |
     grep "tag_name" |
     awk '{print substr($2, 3, length($2)-4) }')
 
-  msg_info "Downloading NPM v${RELEASE}"
-  curl -fsSL "https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE}" | tar -xz
-  cd nginx-proxy-manager-"${RELEASE}" || exit
-  msg_ok "Downloaded NPM v${RELEASE}"
-
-  msg_info "Building Frontend"
-  (
-    sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" backend/package.json
-    sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" frontend/package.json
-    cd ./frontend || exit
-    # Replace node-sass with sass in package.json before installation
-    sed -i 's/"node-sass".*$/"sass": "^1.92.1",/g' package.json
-    $STD yarn install --network-timeout 600000
-    $STD yarn build
-  )
-  msg_ok "Built Frontend"
+  fetch_and_deploy_gh_release "nginxproxymanager" "NginxProxyManager/nginx-proxy-manager"
 
   msg_info "Stopping Services"
   systemctl stop openresty
   systemctl stop npm
   msg_ok "Stopped Services"
 
-  msg_info "Cleaning Old Files"
-  rm -rf /app \
+  msg_info "Cleaning old files"
+  $STD rm -rf /app \
     /var/www/html \
     /etc/nginx \
     /var/log/nginx \
     /var/lib/nginx \
-    "$STD" /var/cache/nginx
-  msg_ok "Cleaned Old Files"
+    /var/cache/nginx
+  msg_ok "Cleaned old files"
 
   msg_info "Setting up Environment"
   ln -sf /usr/bin/python3 /usr/bin/python
-  ln -sf /opt/certbot/bin/certbot /usr/local/bin/certbot
   ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
   ln -sf /usr/local/openresty/nginx/ /etc/nginx
-  sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
-  NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
+  sed -i "s|\"version\": \"2.0.0\"|\"version\": \"$RELEASE\"|" /opt/nginxproxymanager/backend/package.json
+  sed -i "s|\"version\": \"2.0.0\"|\"version\": \"$RELEASE\"|" /opt/nginxproxymanager/frontend/package.json
+  sed -i 's+^daemon+#daemon+g' /opt/nginxproxymanager/docker/rootfs/etc/nginx/nginx.conf
+  NGINX_CONFS=$(find /opt/nginxproxymanager -type f -name "*.conf")
   for NGINX_CONF in $NGINX_CONFS; do
     sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF"
   done
+
   mkdir -p /var/www/html /etc/nginx/logs
-  cp -r docker/rootfs/var/www/html/* /var/www/html/
-  cp -r docker/rootfs/etc/nginx/* /etc/nginx/
-  cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini
-  cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager
+  cp -r /opt/nginxproxymanager/docker/rootfs/var/www/html/* /var/www/html/
+  cp -r /opt/nginxproxymanager/docker/rootfs/etc/nginx/* /etc/nginx/
+  cp /opt/nginxproxymanager/docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini
+  cp /opt/nginxproxymanager/docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager
   ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf
   rm -f /etc/nginx/conf.d/dev.conf
+
   mkdir -p /tmp/nginx/body \
     /run/nginx \
     /data/nginx \
@@ -112,27 +99,33 @@ function update_script() {
     /var/lib/nginx/cache/public \
     /var/lib/nginx/cache/private \
     /var/cache/nginx/proxy_temp
+
   chmod -R 777 /var/cache/nginx
   chown root /tmp/nginx
+
   echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf
+
   if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then
     $STD openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem
   fi
-  mkdir -p /app/global /app/frontend/images
-  cp -r frontend/dist/* /app/frontend
-  cp -r frontend/app-images/* /app/frontend/images
-  cp -r backend/* /app
-  cp -r global/* /app/global
 
-  # Update Certbot and plugins in virtual environment
-  if [ -d /opt/certbot ]; then
-    $STD /opt/certbot/bin/pip install --upgrade pip setuptools wheel
-    $STD /opt/certbot/bin/pip install --upgrade certbot certbot-dns-cloudflare
-  fi
+  mkdir -p /app/frontend/images
+  cp -r /opt/nginxproxymanager/backend/* /app
   msg_ok "Set up Environment"
 
+  msg_info "Building Frontend"
+  export NODE_OPTIONS="--max_old_space_size=2048 --openssl-legacy-provider"
+  cd /opt/nginxproxymanager/frontend
+  # Replace node-sass with sass in package.json before installation
+  sed -E -i 's/"node-sass" *: *"([^"]*)"/"sass": "\1"/g' package.json
+  $STD yarn install --network-timeout 600000
+  $STD yarn build
+  cp -r /opt/nginxproxymanager/frontend/dist/* /app/frontend
+  cp -r /opt/nginxproxymanager/frontend/public/images/* /app/frontend/images
+  msg_ok "Built Frontend"
+
   msg_info "Initializing Backend"
-  $STD rm -rf /app/config/default.json
+  rm -rf /app/config/default.json
   if [ ! -f /app/config/production.json ]; then
     cat <<'EOF' >/app/config/production.json
 {
@@ -148,23 +141,37 @@ function update_script() {
 }
 EOF
   fi
-  cd /app || exit
-  export NODE_OPTIONS="--openssl-legacy-provider"
+  cd /app
   $STD yarn install --network-timeout 600000
   msg_ok "Initialized Backend"
   
+  msg_info "Updating Certbot"
+  [ -f /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg ] && rm -f /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg
+  [ -f /etc/apt/sources.list.d/openresty.list ] && rm -f /etc/apt/sources.list.d/openresty.list
+  [ ! -f /etc/apt/trusted.gpg.d/openresty.gpg ] && curl -fsSL https://openresty.org/package/pubkey.gpg | gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/openresty.gpg
+  [ ! -f /etc/apt/sources.list.d/openresty.sources ] && cat <<'EOF' >/etc/apt/sources.list.d/openresty.sources
+Types: deb
+URIs: http://openresty.org/package/debian/
+Suites: bookworm
+Components: openresty
+Signed-By: /etc/apt/trusted.gpg.d/openresty.gpg
+EOF
+  $STD apt update
+  $STD apt -y install openresty
+  if [ -d /opt/certbot ]; then
+    $STD /opt/certbot/bin/pip install --upgrade pip setuptools wheel
+    $STD /opt/certbot/bin/pip install --upgrade certbot certbot-dns-cloudflare
+  fi
+  msg_ok "Updated Certbot"
+
   msg_info "Starting Services"
   sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf
-  sed -i 's/su npm npm/su root root/g' /etc/logrotate.d/nginx-proxy-manager
-  sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' /opt/certbot/pyvenv.cfg
+  sed -r -i 's/^([[:space:]]*)su npm npm/\1#su npm npm/g;' /etc/logrotate.d/nginx-proxy-manager
   systemctl enable -q --now openresty
   systemctl enable -q --now npm
+  systemctl restart openresty
   msg_ok "Started Services"
 
-  msg_info "Cleaning up"
-  rm -rf ~/nginx-proxy-manager-*
-  msg_ok "Cleaned"
-
   msg_ok "Updated successfully!"
   exit
 }

install/nginxproxymanager-install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2021-2025 tteck
-# Author: tteck (tteckster)
+# Copyright (c) 2021-2025 Community-Scripts ORG
+# Author: tteck (tteckster) | Co-Author: CrazyWolf13
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://nginxproxymanager.com/
 
@@ -39,18 +39,15 @@ $STD /opt/certbot/bin/pip install certbot certbot-dns-cloudflare
 ln -sf /opt/certbot/bin/certbot /usr/local/bin/certbot
 msg_ok "Set up Certbot"
 
-VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
-
 msg_info "Installing Openresty"
-curl -fsSL "https://openresty.org/package/pubkey.gpg" | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg
-case "$VERSION" in
-trixie)
-  echo -e "deb http://openresty.org/package/debian bookworm openresty" >/etc/apt/sources.list.d/openresty.list
-  ;;
-*)
-  echo -e "deb http://openresty.org/package/debian $VERSION openresty" >/etc/apt/sources.list.d/openresty.list
-  ;;
-esac
+curl -fsSL "https://openresty.org/package/pubkey.gpg" | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty.gpg
+cat <<'EOF' >/etc/apt/sources.list.d/openresty.sources
+Types: deb
+URIs: http://openresty.org/package/debian/
+Suites: bookworm
+Components: openresty
+Signed-By: /etc/apt/trusted.gpg.d/openresty.gpg
+EOF
 $STD apt update
 $STD apt -y install openresty
 msg_ok "Installed Openresty"
@@ -61,28 +58,25 @@ RELEASE=$(curl -fsSL https://api.github.com/repos/NginxProxyManager/nginx-proxy-
   grep "tag_name" |
   awk '{print substr($2, 3, length($2)-4) }')
 
-msg_info "Downloading Nginx Proxy Manager v${RELEASE}"
-curl -fsSL "https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE}" | tar -xz
-cd ./nginx-proxy-manager-"${RELEASE}"
-msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}"
+fetch_and_deploy_gh_release "nginxproxymanager" "NginxProxyManager/nginx-proxy-manager"
 
 msg_info "Setting up Environment"
 ln -sf /usr/bin/python3 /usr/bin/python
 ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
 ln -sf /usr/local/openresty/nginx/ /etc/nginx
-sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" backend/package.json
-sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" frontend/package.json
-sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
-NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
+sed -i "s|\"version\": \"2.0.0\"|\"version\": \"$RELEASE\"|" /opt/nginxproxymanager/backend/package.json
+sed -i "s|\"version\": \"2.0.0\"|\"version\": \"$RELEASE\"|" /opt/nginxproxymanager/frontend/package.json
+sed -i 's+^daemon+#daemon+g' /opt/nginxproxymanager/docker/rootfs/etc/nginx/nginx.conf
+NGINX_CONFS=$(find /opt/nginxproxymanager -type f -name "*.conf")
 for NGINX_CONF in $NGINX_CONFS; do
   sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF"
 done
 
 mkdir -p /var/www/html /etc/nginx/logs
-cp -r docker/rootfs/var/www/html/* /var/www/html/
-cp -r docker/rootfs/etc/nginx/* /etc/nginx/
-cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini
-cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager
+cp -r /opt/nginxproxymanager/docker/rootfs/var/www/html/* /var/www/html/
+cp -r /opt/nginxproxymanager/docker/rootfs/etc/nginx/* /etc/nginx/
+cp /opt/nginxproxymanager/docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini
+cp /opt/nginxproxymanager/docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager
 ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf
 rm -f /etc/nginx/conf.d/dev.conf
 
@@ -109,23 +103,22 @@ chown root /tmp/nginx
 echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf
 
 if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then
-  openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null
+  $STD openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem
 fi
 
-mkdir -p /app/global /app/frontend/images
-cp -r backend/* /app
-cp -r global/* /app/global
+mkdir -p /app/frontend/images
+cp -r /opt/nginxproxymanager/backend/* /app
 msg_ok "Set up Environment"
 
 msg_info "Building Frontend"
-cd ./frontend
-export NODE_OPTIONS="--openssl-legacy-provider"
+export NODE_OPTIONS="--max_old_space_size=2048 --openssl-legacy-provider"
+cd /opt/nginxproxymanager/frontend
 # Replace node-sass with sass in package.json before installation
-sed -i 's/"node-sass".*$/"sass": "^1.92.1",/g' package.json
+sed -E -i 's/"node-sass" *: *"([^"]*)"/"sass": "\1"/g' package.json
 $STD yarn install --network-timeout 600000
 $STD yarn build
-cp -r dist/* /app/frontend
-cp -r app-images/* /app/frontend/images
+cp -r /opt/nginxproxymanager/frontend/dist/* /app/frontend
+cp -r /opt/nginxproxymanager/frontend/public/images/* /app/frontend/images
 msg_ok "Built Frontend"
 
 msg_info "Initializing Backend"
@@ -146,7 +139,6 @@ if [ ! -f /app/config/production.json ]; then
 EOF
 fi
 cd /app
-export NODE_OPTIONS="--openssl-legacy-provider"
 $STD yarn install --network-timeout 600000
 msg_ok "Initialized Backend"
 
@@ -170,9 +162,6 @@ WantedBy=multi-user.target
 EOF
 msg_ok "Created Service"
 
-motd_ssh
-customize
-
 msg_info "Starting Services"
 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
@@ -180,8 +169,10 @@ systemctl enable -q --now openresty
 systemctl enable -q --now npm
 msg_ok "Started Services"
 
+motd_ssh
+customize
+
 msg_info "Cleaning up"
-rm -rf ../nginx-proxy-manager-*
 systemctl restart openresty
 $STD apt -y autoremove
 $STD apt -y autoclean