Make supervisor more consistent

Configs go in /etc, sockets in /var/run/supervisor for all invocations.

installer/roles/image_build/files/launch_awx.sh

@@ -14,4 +14,4 @@ awx-manage collectstatic --noinput --clear
 
 unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 
-supervisord -c /supervisor.conf
+supervisord -c /etc/supervisord.conf

installer/roles/image_build/files/supervisor.conf

@@ -1,6 +1,9 @@
 [supervisord]
 nodaemon = True
 umask = 022
+logfile = /dev/stdout
+logfile_maxbytes = 0
+pidfile = /var/run/supervisor/supervisor.web.pid
 
 [program:nginx]
 command = nginx -g "daemon off;"

installer/roles/image_build/files/supervisor_task.conf

@@ -1,12 +1,13 @@
 [supervisord]
 nodaemon = True
 umask = 022
+logfile = /dev/stdout
+logfile_maxbytes = 0
+pidfile = /var/run/supervisor/supervisor.pid
 
 [program:dispatcher]
 command = awx-manage run_dispatcher
 directory = /var/lib/awx
-environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8"
-#user = {{ aw_user }}
 autostart = true
 autorestart = true
 stopwaitsecs = 5
@@ -42,10 +43,10 @@ events=TICK_60
 priority=0
 
 [unix_http_server]
-file=/tmp/supervisor.sock
+file=/var/run/supervisor/supervisor.sock
 
 [supervisorctl]
-serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL  for a unix socket
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

installer/roles/image_build/templates/Dockerfile.j2

@@ -185,8 +185,8 @@ ADD tools/scripts/awx-python /usr/bin/awx-python
 ADD launch_awx.sh /usr/bin/launch_awx.sh
 ADD launch_awx_task.sh /usr/bin/launch_awx_task.sh
 ADD settings.py /etc/tower/settings.py
-ADD supervisor.conf /supervisor.conf
-ADD supervisor_task.conf /supervisor_task.conf
+ADD supervisor.conf /etc/supervisord.conf
+ADD supervisor_task.conf /etc/supervisord_task.conf
 ADD config-watcher /usr/bin/config-watcher
 {% endif %}
 
@@ -198,10 +198,10 @@ RUN for dir in \
       /var/run/awx-rsyslog \
       /var/log/tower \
       /var/log/nginx \
+      /var/run/supervisor \
       /var/lib/nginx ; \
     do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \
     for file in \
-      /supervisord.log \
       /etc/passwd ; \
     do touch $file ; chmod g+rw $file ; chgrp root $file ; done
 

installer/roles/image_build/templates/launch_awx_task.sh.j2

@@ -26,4 +26,4 @@ awx-manage register_queue --queuename=tower --instance_percent=100
 
 unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 
-supervisord -c /supervisor_task.conf
+supervisord -c /etc/supervisord_task.conf