From 4ded4afb7d26ca6d1dcc9c441a1540cc99322cc0 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 13 Nov 2021 02:46:13 +0000 Subject: [PATCH] Move production UWSGI config to a file --- tools/ansible/roles/dockerfile/files/uwsgi.ini | 11 +++++++++++ .../ansible/roles/dockerfile/templates/Dockerfile.j2 | 1 + .../roles/dockerfile/templates/supervisor.conf.j2 | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tools/ansible/roles/dockerfile/files/uwsgi.ini diff --git a/tools/ansible/roles/dockerfile/files/uwsgi.ini b/tools/ansible/roles/dockerfile/files/uwsgi.ini new file mode 100644 index 0000000000..d496ed62c2 --- /dev/null +++ b/tools/ansible/roles/dockerfile/files/uwsgi.ini @@ -0,0 +1,11 @@ +[uwsgi] +socket = 127.0.0.1:8050 +processes = 5 +master = true +vacuum = true +no-orphans = true +lazy-apps = true +master-fifo = /var/lib/awx/awxfifo +max-requests = 1000 +buffer-size = 32768 +module = awx.wsgi:application diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index b5432a86d1..aefd8260bd 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -210,6 +210,7 @@ ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanima ADD tools/ansible/roles/dockerfile/files/launch_awx.sh /usr/bin/launch_awx.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_task.sh ADD tools/ansible/roles/dockerfile/files/settings.py /etc/tower/settings.py +ADD tools/ansible/roles/dockerfile/files/uwsgi.ini /etc/tower/uwsgi.ini ADD {{ template_dest }}/supervisor.conf /etc/supervisord.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf {% endif %} diff --git a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 index e43f85df58..cb93755e44 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 @@ -28,7 +28,7 @@ directory = /awx_devel environment = UWSGI_DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne tower-processes:wsbroadcast' {% else %} -command = /var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768 +command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini directory = /var/lib/awx {% endif %} autostart = true