Support include in the main NGINX context (#302)

Author: alessfg

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 ENHANCEMENTS:
 
-Bump the Ansible `community.general` collection to `6.2.0` and `community.docker` collection to `3.4.0`.
+* Support the `include` directive in the main NGINX context.
+* Bump the Ansible `community.general` collection to `6.2.0` and `community.docker` collection to `3.4.0`.
 
 BUG FIXES:
 

defaults/main/template.yml

@@ -64,13 +64,14 @@ nginx_config_main_template:
       # use: epoll
       # worker_aio_requests: 32  # Number
       worker_connections: 1024  # Number
+    # include:  # String or a list of strings
+    #   - /etc/nginx/modules.conf
     http:
       include:  # String or a list of strings
         - /etc/nginx/mime.types
         - /etc/nginx/conf.d/*.conf
     # stream:
-    #   include:  # String or a list of strings
-    #     - /etc/nginx/conf.d/stream/*.conf
+    #   include: /etc/nginx/conf.d/stream/*.conf  # String or a list of strings
 
 # Enable creating dynamic templated NGINX HTTP configuration files.
 # Defaults will not produce a valid configuration. Instead they are meant to showcase

molecule/common/files/snippets/modules.conf

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

molecule/default/converge.yml

@@ -12,6 +12,11 @@
         nginx_config_selinux_tcp_ports:
           - 80
 
+        nginx_config_upload_enable: true
+        nginx_config_upload:
+          - src: ../common/files/snippets/modules.conf
+            dest: /etc/nginx/modules.conf
+
         nginx_config_upload_ssl_enable: true
         nginx_config_upload_ssl_crt:
           - src: ../common/files/ssl/molecule.crt
@@ -69,6 +74,8 @@
               use: epoll
               worker_aio_requests: 32
               worker_connections: 512
+            include:
+              - /etc/nginx/modules.conf
             http:
               include:
                 - /etc/nginx/conf.d/*.conf

molecule/default/prepare.yml

@@ -8,3 +8,4 @@
       vars:
         nginx_modules:
           - njs
+          - perl

templates/nginx.conf.j2

@@ -5,6 +5,14 @@
 {{ main(nginx_config_main_template['config']['main']) }}
 {%- endif %}
 
+{% if nginx_config_main_template['config']['include'] is defined and nginx_config_main_template['config']['include'] is not mapping %}
+{% for file in nginx_config_main_template['config']['include'] if nginx_config_main_template['config']['include'] is not string %}
+include {{ file }};
+{% else %}
+include {{ nginx_config_main_template['config']['include'] }};
+{% endfor %}
+{%- endif %}
+
 events {
 {% if nginx_config_main_template['config']['events'] is defined %}
 {% from 'core.j2' import events with context %}