External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix supervisor conf file inconsistancy

Browse Source
This commit is contained in:
Hao Liu
2023-04-04 09:59:16 -04:00
parent a0dafbfd8c
commit f62bf6a4c3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh
View File

@@ -24,5 +24,5 @@ cat << EOF > /var/lib/awx/rsyslog/rsyslog.conf
action(type="omfile" file="/dev/null") action(type="omfile" file="/dev/null")
EOF EOF
exec supervisord -c /etc/supervisor_rsyslog.conf exec supervisord -c /etc/supervisord_rsyslog.conf

2
tools/ansible/roles/dockerfile/templates/Dockerfile.j2
View File

@@ -221,7 +221,7 @@ ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_
ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh
ADD {{ template_dest }}/supervisor_web.conf /etc/supervisord_web.conf ADD {{ template_dest }}/supervisor_web.conf /etc/supervisord_web.conf
ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf
ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisor_rsyslog.conf ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisord_rsyslog.conf
{% endif %} {% endif %}
{% if (build_dev|bool) or (kube_dev|bool) %} {% if (build_dev|bool) or (kube_dev|bool) %}
ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link

6
tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
View File

@@ -3,7 +3,7 @@ nodaemon = True
umask = 022 umask = 022
logfile = /dev/stdout logfile = /dev/stdout
logfile_maxbytes = 0 logfile_maxbytes = 0
pidfile = /var/run/supervisor/supervisor.pid pidfile = /var/run/supervisor/supervisor.task.pid
[program:dispatcher] [program:dispatcher]
{% if kube_dev | bool %} {% if kube_dev | bool %}
@@ -70,10 +70,10 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[unix_http_server] [unix_http_server]
file=/var/run/supervisor/supervisor.sock file=/var/run/supervisor/supervisor.task.sock
[supervisorctl] [supervisorctl]
serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL for a unix socket serverurl=unix:///var/run/supervisor/supervisor.task.sock ; use a unix:// URL for a unix socket
[rpcinterface:supervisor] [rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

4
tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2
View File

@@ -29,8 +29,8 @@ environment =
DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne' DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne'
{% else %} {% else %}
command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini
{% endif %}
directory = /var/lib/awx directory = /var/lib/awx
{% endif %}
autorestart = true autorestart = true
startsecs = 30 startsecs = 30
stopasgroup=true stopasgroup=true
@@ -76,7 +76,7 @@ stderr_logfile_maxbytes=0
[program:awx-cache-clear] [program:awx-cache-clear]
{% if kube_dev | bool %} {% if kube_dev | bool %}
command = make cache_clear command = make run-cache-clear
directory = /awx_devel directory = /awx_devel
{% else %} {% else %}
command = awx-manage run_cache_clear command = awx-manage run_cache_clear