Merge pull request #1956 from droopy4096/devel

allow nginx config extension

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

installer/inventory

@@ -118,3 +118,9 @@ secret_key=awxsecret
 # /etc/pki/ca-trust in the awx_task and awx_web containers.
 # NOTE: only obeyed in local_docker install
 #ca_trust_dir=/etc/pki/ca-trust
+
+# Include /etc/nginx/awx_extra.conf
+# Note the use of glob pattern for nginx
+# which makes include "optional" - i.e. not fail
+# if file is absent
+#extra_nginx_include="/etc/nginx/awx_extra[.]conf"

installer/roles/image_build/tasks/main.yml

@@ -128,7 +128,7 @@
   delegate_to: localhost
 
 - name: Stage nginx.conf
-  copy:
+  template:
     src: nginx.conf
     dest: "{{ docker_base_path }}/nginx.conf"
   delegate_to: localhost

installer/roles/image_build/templates/nginx.conf

@@ -86,6 +86,9 @@ http {
             uwsgi_read_timeout 120s;
             uwsgi_pass uwsgi;
             include /etc/nginx/uwsgi_params;
+            {%- if extra_nginx_include is defined %}
+            include {{ extra_nginx_include }};
+            {%- endif %}
             proxy_set_header X-Forwarded-Port 443;
         }
     }