From a27c70812703caa368751d1a8d0e2c08b5941a68 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Tue, 18 Oct 2016 14:47:14 -0400
Subject: [PATCH] let nginx serve static files

---
 Makefile                                   |  2 +-
 tools/docker-compose/nginx.vh.default.conf | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e43cc3037a..77ab70f13c 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,7 @@ uwsgi: collectstatic
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/tower/bin/activate; \
 	fi; \
-    uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=60 --static-map /static=/tower_devel/awx/ui/static --static-map /static=/tower_devel/awx/static --static-map /static=/tower_devel/awx/public/static
+    uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=60
 
 daphne:
 	@if [ "$(VENV_BASE)" ]; then \
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 345d82e706..99c776fcd3 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -19,6 +19,12 @@ server {
 	ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 	ssl_ciphers HIGH:!aNULL:!MD5;
 
+    location /static/ {
+        root /tower_devel;
+        try_files /awx/ui /awx/static /awx/public/static =404;
+        access_log off;
+    }
+
 	location /websocket {
 		# Pass request to the upstream alias
 		proxy_pass http://daphne;
@@ -45,8 +51,4 @@ server {
 		include /etc/nginx/uwsgi_params;
 		uwsgi_pass uwsgi;
 	}
-
-    location /static/ {
-        root /tower_devel/awx/ui/;
-    } 
 }