diff --git a/Dockerfile b/Dockerfile index 626262de..96b4bada 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN apk add --no-cache build-base libffi-dev && \ . /usr/local/certbot/bin/activate && \ pip install --no-cache-dir certbot -FROM zoeyvid/nginx-quic:111 +FROM zoeyvid/nginx-quic:112 RUN apk add --no-cache ca-certificates tzdata \ nodejs-current \ openssl apache2-utils \ diff --git a/backend/templates/_access.conf b/backend/templates/_access.conf index 447006c0..1562e6ed 100644 --- a/backend/templates/_access.conf +++ b/backend/templates/_access.conf @@ -2,7 +2,7 @@ {% if access_list.items.length > 0 %} # Authorization auth_basic "Authorization required"; - auth_basic_user_file /data/access/{{ access_list_id }}; + auth_basic_user_file /data/etc/access/{{ access_list_id }}; {% if access_list.pass_auth == 0 %} proxy_set_header Authorization ""; diff --git a/frontend/package.json b/frontend/package.json index 55273369..789a29d7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "dependencies": { - "@babel/core": "7.21.4", + "@babel/core": "7.21.5", "babel-core": "6.26.3", "babel-loader": "8.3.0", "babel-preset-env": "1.7.0", diff --git a/rootfs/bin/start.sh b/rootfs/bin/start.sh index 3d3ed462..8a216f8c 100755 --- a/rootfs/bin/start.sh +++ b/rootfs/bin/start.sh @@ -424,6 +424,7 @@ if [ "$PUID" != "0" ]; then /tmp/acme-challenge \ /tmp/certbot-work \ /tmp/certbot-log || exit 1 + sed -i "s|user root;|#user root;|g" /usr/local/nginx/conf/nginx.conf || sleep inf sudo -Eu npmuser launch.sh || exit 1 else chown -R 0:0 /usr/local/certbot \ @@ -432,5 +433,6 @@ else /tmp/acme-challenge \ /tmp/certbot-work \ /tmp/certbot-log || exit 1 + sed -i "s|#user root;|user root;|g" /usr/local/nginx/conf/nginx.conf || sleep inf launch.sh || exit 1 fi diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf index 3237b0cc..635eac7d 100644 --- a/rootfs/usr/local/nginx/conf/nginx.conf +++ b/rootfs/usr/local/nginx/conf/nginx.conf @@ -1,3 +1,4 @@ +user root; daemon off; pcre_jit on; worker_processes auto;