diff --git a/doc/ADVANCED_NGINX.md b/doc/ADVANCED_NGINX.md new file mode 100644 index 0000000..eabac84 --- /dev/null +++ b/doc/ADVANCED_NGINX.md @@ -0,0 +1,17 @@ +## Advanced Nginx Configuration + +If you are a more advanced user, you might be itching for extra Nginx customizability. + +NPM has the ability to include different custom configuration snippets in different places. + +You can add your custom configuration snippet files at `/data/nginx/custom` as follow: + +`/data/nginx/custom/root.conf`: Included at the very end of nginx.conf +`/data/nginx/custom/http.conf`: Included at the end of the main http block +`/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block +`/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection server block +`/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block +`/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block +`/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block + +Every file is optional. \ No newline at end of file diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf index 1933256..ea45b53 100644 --- a/rootfs/etc/nginx/nginx.conf +++ b/rootfs/etc/nginx/nginx.conf @@ -76,6 +76,9 @@ http { include /data/nginx/redirection_host/*.conf; include /data/nginx/dead_host/*.conf; include /data/nginx/temp/*.conf; + + # Custom + include /data/nginx/custom/http[.]conf; } stream { @@ -83,3 +86,5 @@ stream { include /data/nginx/stream/*.conf; } +# Custom +include /data/nginx/custom/root[.]conf; diff --git a/src/backend/templates/proxy_host.conf b/src/backend/templates/proxy_host.conf index fc58a43..8d8c97d 100644 --- a/src/backend/templates/proxy_host.conf +++ b/src/backend/templates/proxy_host.conf @@ -41,5 +41,7 @@ server { } {% endif %} + # Custom + include /data/nginx/custom/server_proxy[.]conf; } {% endif %} diff --git a/src/backend/templates/redirection_host.conf b/src/backend/templates/redirection_host.conf index 3e6c2b4..463f3a8 100644 --- a/src/backend/templates/redirection_host.conf +++ b/src/backend/templates/redirection_host.conf @@ -25,5 +25,7 @@ server { } {% endif %} + # Custom + include /data/nginx/custom/server_redirect[.]conf; } {% endif %} diff --git a/src/backend/templates/stream.conf b/src/backend/templates/stream.conf index 53356cf..a6dc054 100644 --- a/src/backend/templates/stream.conf +++ b/src/backend/templates/stream.conf @@ -7,12 +7,20 @@ server { listen {{ incoming_port }}; proxy_pass {{ forward_ip }}:{{ forwarding_port }}; + + # Custom + include /data/nginx/custom/server_stream[.]conf; + include /data/nginx/custom/server_stream_tcp[.]conf; } {% endif %} {% if udp_forwarding == 1 or udp_forwarding == true %} server { listen {{ incoming_port }} udp; proxy_pass {{ forward_ip }}:{{ forwarding_port }}; + + # Custom + include /data/nginx/custom/server_stream[.]conf; + include /data/nginx/custom/server_stream_udp[.]conf; } {% endif %} {% endif %} \ No newline at end of file