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

Add unit tests for reconfiguring rsyslog & for test endpoint

Browse Source
This commit is contained in:
Christian Adams
2020-03-12 17:45:52 -04:00
parent d31c528257
commit fb047b1267
5 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/docker-compose/supervisor.conf
View File

@@ -72,11 +72,7 @@ stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
[program:awx-rsyslogd]
<<<<<<< HEAD
command = rsyslogd -n -i /var/run/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
=======
command = rsyslogd -n -i /var/run/tower/sockets/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
>>>>>>> 3a8bd7c40... Fix Logging settings "Test" button functionality
autostart = true
autorestart = true
stopwaitsecs = 1