Rename awx rsyslog socket and PID dir

tools/docker-compose/Dockerfile

@@ -123,7 +123,7 @@ ADD tools/docker-compose/entrypoint.sh /
 ADD tools/scripts/awx-python /usr/bin/awx-python
 
 # Pre-create things that we need to write to
-RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
+RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
     do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \
     \
     for file in /etc/passwd /etc/supervisord.conf /venv/awx/lib/python3.6/site-packages/awx.egg-link /var/run/nginx.pid; \

tools/docker-compose/rsyslog.conf

@@ -2,6 +2,6 @@ $WorkDirectory /var/lib/awx/rsyslog
 $MaxMessageSize 700000
 $IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf
 module(load="imuxsock" SysSock.Use="off")
-input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")
+input(type="imuxsock" Socket="/var/run/awx-rsyslog/rsyslog.sock" unlink="on")
 template(name="awx" type="string" string="%msg%")
 action(type="omfile" file="/dev/null")

tools/docker-compose/supervisor.conf

@@ -72,7 +72,7 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
 [program:awx-rsyslogd]
-command = rsyslogd -n -i /var/run/rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
+command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
 autostart = true
 autorestart = true
 stopwaitsecs = 1