From 4f6d966babd2214d76199ed1939051121e1e7592 Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Tue, 18 Oct 2016 14:19:18 -0400
Subject: [PATCH 1/2] put nginx into honcho flow

* allows for make docker-compose-test then make honcho flow
---
 Makefile                                  | 3 +++
 Procfile                                  | 1 +
 tools/docker-compose/start_development.sh | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8cb02df323..e43cc3037a 100644
--- a/Makefile
+++ b/Makefile
@@ -449,6 +449,9 @@ factcacher:
 	fi; \
 	$(PYTHON) manage.py run_fact_cache_receiver
 
+nginx:
+	nginx -g "daemon off;"
+
 reports:
 	mkdir -p $@
 
diff --git a/Procfile b/Procfile
index 09dfe2411c..b30dfcad2b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,4 @@
+nginx:          make nginx
 runworker:      make runworker
 daphne:         make daphne
 celeryd:        make celeryd
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 01fa0a9dcd..e2db66c3e4 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -40,8 +40,5 @@ make version_file
 make migrate
 make init
 
-# Start nginx
-nginx
-
 # Start the service
 make honcho

From ad2bee1f576be588a56959ec09a59e4473bf0894 Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Tue, 18 Oct 2016 14:23:33 -0400
Subject: [PATCH 2/2] sym link nginx config by popular demand

---
 tools/docker-compose/Dockerfile            | 4 ++--
 tools/docker-compose/nginx.vh.default.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 2527b2bb35..834537858a 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -23,8 +23,8 @@ ADD tools/docker-compose/ansible-tower.egg-link /tmp/ansible-tower.egg-link
 ADD tools/docker-compose/tower-manage /usr/local/bin/tower-manage
 ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
 ADD tools/docker-compose/ansible_tower.egg-info /tmp/ansible_tower.egg-info
-ADD tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
-ADD tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
+RUN ln -Ffs /tower_devel/tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
+RUN ln -Ffs /tower_devel/tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
 RUN ln -s /tower_devel/tools/docker-compose/start_development.sh /start_development.sh
 RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=Tower Development/CN=tower.localhost"
 RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 60073d4797..52780698f4 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -1,9 +1,9 @@
 upstream uwsgi {
-    server tower:8050;
+    server localhost:8050;
 }
 
 upstream daphne {
-    server tower:8051;
+    server localhost:8051;
 }
 
 server {