External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6856 from ryanpetrello/devel

Browse Source 
merge in a few downstream fixes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-28 17:21:28 +00:00
committed by GitHub
parent fcc99baaa8 aad371d224
commit def3114b5b
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