diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 7963ceb84..9b1373a98 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_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" @@ -60,8 +60,9 @@ function update_script() { fi $STD apt install -y build-essential "$pcre_pkg" libssl-dev zlib1g-dev - if check_for_gh_release "openresty" "openresty/openresty"; then - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "openresty" "openresty/openresty" "prebuild" "${CHECK_UPDATE_RELEASE}" "/opt/openresty" "openresty-*.tar.gz" + OPENRESTY_VERSION="1.29.2.5" + if [[ "$(cat ~/.openresty 2>/dev/null)" != "$OPENRESTY_VERSION" ]]; then + CLEAN_INSTALL=1 fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" msg_info "Building OpenResty" cd /opt/openresty @@ -77,6 +78,7 @@ function update_script() { --with-stream_ssl_module $STD make -j"$(nproc)" $STD make install + echo "${OPENRESTY_VERSION}" >~/.openresty rm -rf /opt/openresty cat <<'EOF' >/lib/systemd/system/openresty.service [Unit] diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index c3a038b4f..4c5471b83 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -18,7 +18,7 @@ $STD apt install -y \ apache2-utils \ logrotate \ build-essential \ - libpcre3-dev \ + libpcre2-dev \ libssl-dev \ zlib1g-dev \ git \ @@ -36,7 +36,8 @@ $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" -fetch_and_deploy_gh_release "openresty" "openresty/openresty" "prebuild" "latest" "/opt/openresty" "openresty-*.tar.gz" +OPENRESTY_VERSION="1.29.2.5" +fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" msg_info "Building OpenResty" cd /opt/openresty @@ -52,6 +53,7 @@ $STD ./configure \ --with-stream_ssl_module $STD make -j"$(nproc)" $STD make install +echo "${OPENRESTY_VERSION}" >~/.openresty rm -rf /opt/openresty cat <<'EOF' >/lib/systemd/system/openresty.service