External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into devel

Browse Source
This commit is contained in:
mo-saeed
2020-06-06 00:19:19 +02:00
committed by GitHub
parent 1e6437b773 3cdeb48d3f
commit 0bfcacfcf4
172 changed files with 4810 additions and 1885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/roles/kubernetes/templates/launch_awx.yml.j2
View File

@@ -35,7 +35,7 @@ data:
unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
supervisord -c /supervisor_task.conf
supervisord -c /etc/supervisord_task.conf
launch-awx-web: |
#!/usr/bin/env bash
@@ -54,5 +54,5 @@ data:
unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
supervisord -c /supervisor.conf
supervisord -c /etc/supervisord.conf

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

@@ -8,6 +8,9 @@ data:
[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;"
@@ -93,6 +96,9 @@ data:
[supervisord]
nodaemon = True
umask = 022
logfile = /dev/stdout
logfile_maxbytes = 0
pidfile = /var/run/supervisor/supervisor.pid
[program:dispatcher]
command = awx-manage run_dispatcher
@@ -133,10 +139,10 @@ data:
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