External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 11:40:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-28 12:18:13 -04:00
parent b31abbba82 0d30a67756
commit aad371d224
34 changed files with 291 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/image_build/files/supervisor.conf
View File

@@ -50,7 +50,7 @@ stderr_logfile_maxbytes=0
command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
autostart = true
autorestart = true
stopwaitsecs = 1
stopwaitsecs = 5
stopsignal=KILL
stopasgroup=true
killasgroup=true

2
installer/roles/kubernetes/templates/supervisor.yml.j2
View File

@@ -57,7 +57,7 @@ data:
command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
autostart = true
autorestart = true
stopwaitsecs = 1
stopwaitsecs = 5
stopsignal=KILL
stopasgroup=true
killasgroup=true