diff options
| author | Jeff Byrnes <rbyrnes@athenahealth.com> | 2019-04-03 17:11:33 +0200 |
|---|---|---|
| committer | Jeff Byrnes <rbyrnes@athenahealth.com> | 2019-04-05 22:13:23 +0200 |
| commit | 28e3c635622f8f0b2838277c2770143a5c49c511 (patch) | |
| tree | 1350a937764669b769bebae49279eb493cf82d52 /installer/roles | |
| parent | Merge pull request #3635 from ryanpetrello/i-am-so-smrt (diff) | |
| download | awx-28e3c635622f8f0b2838277c2770143a5c49c511.tar.xz awx-28e3c635622f8f0b2838277c2770143a5c49c511.zip | |
Add optional SSL cert to docker-compose install
In #3322, this mount was added, but only to the standalone
Docker install setup:
github.com/ansible/awx/pull/3322/files#diff-596e32ab54a52bfed763f8a639499fe0
This ensures that the SSL cert is loaded when using docker-compose,
which is the only Docker-based method available as of v4.0.0
Diffstat (limited to 'installer/roles')
| -rw-r--r-- | installer/roles/local_docker/templates/docker-compose.yml.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index 138d0e9871..3fba670f15 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -26,6 +26,9 @@ services: {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} + {% if ssl_certificate is defined %} + - "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}" + {% endif %} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %} dns_search: @@ -72,6 +75,9 @@ services: {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} + {% if ssl_certificate is defined %} + - "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}" + {% endif %} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %} dns_search: |