External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3739 from chrismeyersfsu/improvement-nginx_honcho

Browse Source 
put nginx into honcho flow
This commit is contained in:
Chris Meyers 2016-10-18 14:23:54 -04:00 committed by GitHub
commit 0c5d6e503d
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -449,6 +449,9 @@ factcacher:
fi; \
$(PYTHON) manage.py run_fact_cache_receiver
nginx:
nginx -g "daemon off;"
reports:
mkdir -p $@

1
Procfile
View File

@ -1,3 +1,4 @@
nginx: make nginx
runworker: make runworker
daphne: make daphne
celeryd: make celeryd

4
tools/docker-compose/Dockerfile
View File

@ -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

4
tools/docker-compose/nginx.vh.default.conf
View File

@ -1,9 +1,9 @@
upstream uwsgi {
server tower:8050;
server localhost:8050;
}
upstream daphne {
server tower:8051;
server localhost:8051;
}
server {

3
tools/docker-compose/start_development.sh
View File

@ -40,8 +40,5 @@ make version_file
make migrate
make init
# Start nginx
nginx
# Start the service
make honcho