1
0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-09 01:02:06 +03:00

Merge branch 'develop' into openidc

This commit is contained in:
Michael Leer
2024-08-22 23:19:50 +01:00
230 changed files with 8881 additions and 18148 deletions

View File

@@ -1,7 +1,7 @@
# run nginx in foreground
daemon off;
user root;
pid /run/nginx/nginx.pid;
user npm;
# Set number of worker processes automatically based on number of CPU cores.
worker_processes auto;
@@ -14,8 +14,11 @@ error_log /data/logs/fallback_error.log warn;
# Includes files with directives to load dynamic modules.
include /etc/nginx/modules/*.conf;
# Custom
include /data/nginx/custom/root_top[.]conf;
events {
worker_connections 1024;
include /data/nginx/custom/events[.]conf;
}
http {
@@ -58,6 +61,8 @@ http {
access_log /data/logs/fallback_access.log proxy;
include /etc/nginx/conf.d/include/log.conf;
# Dynamically generated resolvers file
include /etc/nginx/conf.d/include/resolvers.conf;
@@ -67,7 +72,7 @@ http {
}
# Real IP Determination
# Local subnets:
set_real_ip_from 10.0.0.0/8;
set_real_ip_from 172.16.0.0/12; # Includes Docker subnet