From 1de6cc4cb866b17ff92ab7dec812329d6b8f3f44 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Wed, 10 May 2023 10:10:46 -0400
Subject: [PATCH] Update nginxproxymanager.sh

using `RELEASE` to obtain the latest version for updating
---
 ct/nginxproxymanager.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh
index 4425570c..b460da3f 100644
--- a/ct/nginxproxymanager.sh
+++ b/ct/nginxproxymanager.sh
@@ -74,18 +74,18 @@ function update_script() {
     /var/cache/nginx &>/dev/null
   msg_ok "Cleaned Old Files"
 
-  msg_info "Downloading NPM v2.10.2"
-  wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.10.2 -O - | tar -xz &>/dev/null
-  cd nginx-proxy-manager-2.10.2
-  msg_ok "Downloaded NPM v2.10.2"
+  msg_info "Downloading NPM v${RELEASE}"
+  wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz &>/dev/null
+  cd nginx-proxy-manager-${RELEASE}
+  msg_ok "Downloaded NPM v${RELEASE}"
 
   msg_info "Setting up Enviroment"
   ln -sf /usr/bin/python3 /usr/bin/python
   ln -sf /usr/bin/certbot /opt/certbot/bin/certbot
   ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
   ln -sf /usr/local/openresty/nginx/ /etc/nginx
-  sed -i "s+0.0.0+2.10.2+g" backend/package.json
-  sed -i "s+0.0.0+2.10.2+g" frontend/package.json
+  sed -i "s+0.0.0+${RELEASE}+g" backend/package.json
+  sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json
   sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
   NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
   for NGINX_CONF in $NGINX_CONFS; do
@@ -124,8 +124,8 @@ function update_script() {
   mkdir -p /app/global /app/frontend/images
   cp -r backend/* /app
   cp -r global/* /app/global
-  wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-noarch.tar.xz"
-  wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-x86_64.tar.xz"
+  wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.5.0/s6-overlay-noarch.tar.xz"
+  wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.5.0/s6-overlay-x86_64.tar.xz"
   tar -C / -Jxpf s6-overlay-noarch.tar.xz
   tar -C / -Jxpf s6-overlay-x86_64.tar.xz
   python3 -m pip install --no-cache-dir certbot-dns-cloudflare &>/dev/null
@@ -163,7 +163,7 @@ EOF
   msg_ok "Initialized Backend"
 
   msg_info "Starting Services"
-  sed -i -e 's/^pid/#pid/' -e 's/npmuser/root/' /usr/local/openresty/nginx/conf/nginx.conf
+  sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf
   sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' /opt/certbot/pyvenv.cfg
   systemctl enable -q --now openresty
   systemctl enable -q --now npm