Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

merge upstream

Browse source
This commit is contained in:
Zoey 2024-07-11 16:04:25 +02:00
parent 603164791b
commit b9c4de0422
No known key found for this signature in database
GPG key ID: 02A3919EB4F67328
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootfs/usr/local/bin/start.sh
View file

@ -444,6 +444,10 @@ if [ -s /data/nginx/dummykey.pem ]; then
mv -vn /data/nginx/dummykey.pem /data/tls/dummykey.pem mv -vn /data/nginx/dummykey.pem /data/tls/dummykey.pem
fi fi
if [ -f /data/nginx/custom/root.conf ]; then
mv -vn /data/nginx/custom/root.conf /data/nginx/custom/root_top.conf
fi
if [ -n "$(ls -A /data/nginx/html 2> /dev/null)" ]; then if [ -n "$(ls -A /data/nginx/html 2> /dev/null)" ]; then
mv -vn /data/nginx/html/* /data/etc/html mv -vn /data/nginx/html/* /data/etc/html
fi fi
@ -533,10 +537,10 @@ fi
touch /data/etc/html/index.html \ touch /data/etc/html/index.html \
/data/nginx/ip_ranges.conf \ /data/nginx/ip_ranges.conf \
/data/nginx/custom/root.conf \
/data/nginx/custom/events.conf \ /data/nginx/custom/events.conf \
/data/nginx/custom/http.conf \ /data/nginx/custom/http.conf \
/data/nginx/custom/http_top.conf \ /data/nginx/custom/http_top.conf \
/data/nginx/custom/root_top.conf \
/data/nginx/custom/server_dead.conf \ /data/nginx/custom/server_dead.conf \
/data/nginx/custom/server_proxy.conf \ /data/nginx/custom/server_proxy.conf \
/data/nginx/custom/server_redirect.conf \ /data/nginx/custom/server_redirect.conf \

2
rootfs/usr/local/nginx/conf/nginx.conf
View file

@ -6,7 +6,7 @@ worker_processes auto;
worker_cpu_affinity auto; worker_cpu_affinity auto;
# Custom # Custom
include /data/nginx/custom/root.conf; include /data/nginx/custom/root_top.conf;
events { events {
# Custom # Custom