From d64ee1fdd3ba4f9f4c31233a4a77ed2036dd26a7 Mon Sep 17 00:00:00 2001 From: MooBaloo Date: Thu, 28 Jan 2021 06:00:59 -0500 Subject: [PATCH] Move custom http.conf above includes for NPM-generated files. Added a new clause for custom http.conf above the include clauses for NPM-generated files. Allows for more flexibility with adding custom nginx .conf files to NPM Use case: adding a configuration change needs to be present before other custom configuration files are called and reference configuration from the custom http.conf file. Example: add a new log_format in httpconf, then referencing it in a access_log clause in server_proxy.conf. --- docker/rootfs/etc/nginx/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/rootfs/etc/nginx/nginx.conf b/docker/rootfs/etc/nginx/nginx.conf index 4524d2d2..fe7fc9a5 100644 --- a/docker/rootfs/etc/nginx/nginx.conf +++ b/docker/rootfs/etc/nginx/nginx.conf @@ -69,6 +69,9 @@ http { real_ip_header X-Real-IP; real_ip_recursive on; + # Custom + include /data/nginx/custom/http[.]conf; + # Files generated by NPM include /etc/nginx/conf.d/*.conf; include /data/nginx/default_host/*.conf; @@ -76,9 +79,6 @@ 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 {