External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-31 17:18:59 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-05-08 16:48:48 -04:00
parent 5e02e6e4a4 9668d18203
commit 086d6951b4
23 changed files with 11276 additions and 9788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslo
autostart = true
autorestart = true
stopwaitsecs = 5
stopsignal=KILL
stopsignal=TERM
stopasgroup=true
killasgroup=true
redirect_stderr=true

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

@@ -58,7 +58,7 @@ data:
autostart = true
autorestart = true
stopwaitsecs = 5
stopsignal=KILL
stopsignal=TERM
stopasgroup=true
killasgroup=true
redirect_stderr=true