nginx.conf: include /etc/nginx/main.d/*.conf files at the top

Author: macbre

nginx.conf

@@ -1,10 +1,17 @@
+# this allows you to call directives such as "env" in your own conf files
+# http://nginx.org/en/docs/ngx_core_module.html#env
+#
+# and load dynamic modules via load_module
+# http://nginx.org/en/docs/ngx_core_module.html#load_module
+include /etc/nginx/main.d/*.conf;
+
+
 user  nginx;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
-
 events {
     worker_connections  1024;
 }
@@ -34,6 +41,3 @@ http {
     include /etc/nginx/conf.d/*.conf;
 }
 
-# this allows you to call directives such as "env" in your own conf files
-# http://nginx.org/en/docs/ngx_core_module.html#env
-include /etc/nginx/main.d/*.conf;

run-docker.sh

@@ -4,6 +4,7 @@ docker run --rm \
   -p 0.0.0.0:8889:443/tcp \
   -p 0.0.0.0:8889:443/udp \
   -v "$PWD/tests":/static:ro \
+  -v "$PWD/tests/modules.conf":/etc/nginx/main.d/modules.conf:ro \
   -v "$PWD/tests/static.conf":/etc/nginx/conf.d/static.conf:ro \
   -v "$PWD/tests/https.conf":/etc/nginx/conf.d/https.conf:ro \
   -v "$PWD/tests/localhost.crt":/etc/nginx/ssl/localhost.crt:ro \

tests/modules.conf

@@ -0,0 +1,2 @@
+load_module modules/ngx_http_geoip_module.so;
+load_module modules/ngx_http_perl_module.so;