diff --git a/installer/inventory b/installer/inventory index 8b811fbf27..7ac394065b 100644 --- a/installer/inventory +++ b/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" diff --git a/installer/roles/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml index 55c5ed341a..542fb14aa1 100644 --- a/installer/roles/image_build/tasks/main.yml +++ b/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 diff --git a/installer/roles/image_build/files/nginx.conf b/installer/roles/image_build/templates/nginx.conf similarity index 95% rename from installer/roles/image_build/files/nginx.conf rename to installer/roles/image_build/templates/nginx.conf index e077811a33..4fad387df1 100644 --- a/installer/roles/image_build/files/nginx.conf +++ b/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; } }