diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 40b22a05..769dc19f 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -25,7 +25,7 @@ jobs: curl -L https://code.jquery.com/jquery-"$(git ls-remote --tags https://github.com/jquery/jquery | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")".min.js -o rootfs/nftd/jquery.min.js curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")"/dist/css/bootstrap.min.css -o rootfs/html/404/bootstrap.min.css curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")"/dist/css/bootstrap.min.css -o rootfs/html/default/bootstrap.min.css - - name: eslint + - name: nginxbeautifier run: | yarn global add nginxbeautifier mv rootfs/usr/local/nginx/conf/conf.d/include/block-exploits.conf block-exploits.conf diff --git a/README.md b/README.md index c5642e0e..5cfeec4f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,9 @@ running at home or otherwise, including free TLS, without having to know too muc - [Screenshots](https://nginxproxymanager.com/screenshots) ---> + **Note: Reloading the NPMplus UI can cause a 502 error. See https://github.com/ZoeyVid/NPMplus/issues/241.**
**Note: NO armv7 support.**
**Note: add `net.ipv4.ip_unprivileged_port_start=0` at the end of `/etc/sysctl.conf` to support PUID/PGID in network mode host.**
diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js index 8c7970f9..795323c7 100644 --- a/backend/internal/nginx.js +++ b/backend/internal/nginx.js @@ -120,14 +120,16 @@ const internalNginx = { if (fs.existsSync(NgxPidFilePath)) { const ngxPID = fs.readFileSync(NgxPidFilePath, 'utf8').trim(); if (ngxPID.length > 0) { - logger.info('Quitting Nginx'); - utils.exec('nginx -s quit'); + logger.info('Reloading Nginx'); + utils.exec('nginx -s reload'); + } else { + logger.info('Starting Nginx'); + utils.execfg('nginx -e stderr'); } - } - logger.info('Starting Nginx in three seconds'); - setTimeout(() => { + } else { + logger.info('Starting Nginx'); utils.execfg('nginx -e stderr'); - }, 3000); + } }); },