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

Add 'ca_trust_dir' variable to allow Custom CA sharing between host and containers

Browse Source
This commit is contained in:
jeff
2018-03-14 11:40:56 +01:00
parent 4972755ccb
commit aca74d05ae
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
installer/inventory
View File

@@ -95,3 +95,9 @@ pg_port=5432
# AWX project data folder. If you need access to the location where AWX stores the projects # AWX project data folder. If you need access to the location where AWX stores the projects
# it manages from the docker host, you can set this to turn it into a volume for the container. # it manages from the docker host, you can set this to turn it into a volume for the container.
#project_data_dir=/var/lib/awx/projects #project_data_dir=/var/lib/awx/projects
# CA Trust directory. If you need to provide custom CA certificates, supplying
# this variable causes this directory on the host to be bind mounted over
# /etc/pki/ca-trust in the awx_task and awx_web containers.
# NOTE: only obeyed in local_docker install
#ca_trust_dir=/etc/pki/ca-trust

8
installer/local_docker/templates/docker-compose.yml.j2
View File

@@ -15,10 +15,16 @@ services:
hostname: awxweb hostname: awxweb
user: root user: root
restart: unless-stopped restart: unless-stopped
{% if project_data_dir is defined %} {% if (project_data_dir is defined) or (ca_trust_dir is defined) %}
volumes: volumes:
{% endif %}
{% if project_data_dir is defined %}
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
{% endif %} {% endif %}
{% endif %}
{% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}"
{% endif %}
{% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%}
{% set awx_container_search_domains_list = awx_container_search_domains.split(',') %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
dns_search: dns_search: