From adaa164a1910c1027c22ac3bc62e27a5cc04b237 Mon Sep 17 00:00:00 2001
From: Dmytro Makovey <dmakovey@stanford.edu>
Date: Tue, 5 Jun 2018 08:16:08 -0700
Subject: [PATCH] allow nginx config extension

---
 installer/inventory                                         | 6 ++++++
 installer/roles/image_build/tasks/main.yml                  | 2 +-
 installer/roles/image_build/{files => templates}/nginx.conf | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
 rename installer/roles/image_build/{files => templates}/nginx.conf (95%)

diff --git a/installer/inventory b/installer/inventory
index c9e8ce612d..9e5db0d8c0 100644
--- a/installer/inventory
+++ b/installer/inventory
@@ -111,3 +111,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 c8b1d7d628..873e8f95be 100644
--- a/installer/roles/image_build/tasks/main.yml
+++ b/installer/roles/image_build/tasks/main.yml
@@ -134,7 +134,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 6538878b48..de09ad918e 100644
--- a/installer/roles/image_build/files/nginx.conf
+++ b/installer/roles/image_build/templates/nginx.conf
@@ -84,6 +84,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 %}
         }
     }
 }