diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index ae1849ef1..c5e6e798b 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -38,8 +38,8 @@ function update_script() { CURRENT_NODE_VERSION=$(node --version | cut -d'v' -f2 | cut -d'.' -f1) if [[ "$CURRENT_NODE_VERSION" != "22" ]]; then systemctl stop openresty - apt-get purge -y nodejs npm - apt-get autoremove -y + $STD apt purge -y nodejs npm + $STD apt autoremove -y rm -rf /usr/local/bin/node /usr/local/bin/npm rm -rf /usr/local/lib/node_modules rm -rf ~/.npm @@ -49,9 +49,7 @@ function update_script() { NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs - 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) }') + RELEASE=$(get_latest_github_release "NginxProxyManager/nginx-proxy-manager") CLEAN_INSTALL=1 fetch_and_deploy_gh_release "nginxproxymanager" "NginxProxyManager/nginx-proxy-manager" "tarball" "v${RELEASE}" "/opt/nginxproxymanager" @@ -211,7 +209,6 @@ EOF systemctl daemon-reload systemctl enable -q --now openresty systemctl enable -q --now npm - systemctl restart openresty msg_ok "Started Services" msg_ok "Updated successfully!" diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index f8c1a0300..328cfd5dd 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -15,24 +15,19 @@ update_os msg_info "Installing Dependencies" $STD apt install -y \ - ca-certificates \ apache2-utils \ logrotate \ build-essential \ libpcre3-dev \ libssl-dev \ zlib1g-dev \ - git -msg_ok "Installed Dependencies" - -msg_info "Installing Python Dependencies" -$STD apt install -y \ + git \ python3 \ python3-dev \ python3-pip \ python3-venv \ python3-cffi -msg_ok "Installed Python Dependencies" +msg_ok "Installed Dependencies" msg_info "Setting up Certbot" $STD python3 -m venv /opt/certbot @@ -76,11 +71,7 @@ EOF msg_ok "Built OpenResty" NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs - -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) }') - +RELEASE=$(get_latest_github_release "NginxProxyManager/nginx-proxy-manager") fetch_and_deploy_gh_release "nginxproxymanager" "NginxProxyManager/nginx-proxy-manager" "tarball" "v${RELEASE}" msg_info "Setting up Environment" @@ -190,9 +181,8 @@ msg_ok "Created Service" 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 -#systemctl enable -q --now openresty +systemctl enable -q --now openresty systemctl enable -q --now npm -systemctl restart openresty msg_ok "Started Services" motd_ssh