From 56de6621b51304c39571d57fe38ab5438c0d1e53 Mon Sep 17 00:00:00 2001
From: Carl Mercier <foss@carlmercier.com>
Date: Fri, 26 Jul 2019 07:51:18 -0400
Subject: [PATCH] Allow including custom nginx conf files

Give advanced users more flexibility by allowing them to include custom config files at differents locations in the nginx configuration.

`/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
---
 rootfs/etc/nginx/nginx.conf                 | 5 +++++
 src/backend/templates/proxy_host.conf       | 2 ++
 src/backend/templates/redirection_host.conf | 2 ++
 src/backend/templates/stream.conf           | 8 ++++++++
 4 files changed, 17 insertions(+)

diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf
index 19332564..e5cd23d0 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 fc58a43b..f0a681dd 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 3e6c2b44..10d9fe7c 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 53356cfd..7b28c744 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