External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-24 00:57:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make supervisor more consistent

Browse Source 
Configs go in /etc, sockets in /var/run/supervisor for all invocations.
This commit is contained in:
Bill Nottingham
2020-05-28 17:38:16 -04:00
parent ec2c121762
commit 559d917184
10 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -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