diff --git a/installer/inventory b/installer/inventory index 00a0cb4fad..84a4b77b00 100644 --- a/installer/inventory +++ b/installer/inventory @@ -66,6 +66,8 @@ postgres_data_dir="~/.awx/pgdocker" host_port=80 host_port_ssl=443 #ssl_certificate= +# Optional key file +#ssl_certificate_key= docker_compose_dir="~/.awx/awxcompose" # Required for Openshift when building the image on your own diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index c908f7da3b..ffd18adb5c 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -38,7 +38,10 @@ services: {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} - {% if ssl_certificate is defined %} + {% if (ssl_certificate is defined) and (ssl_certificate_key is defined) %} + - "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}" + - "{{ ssl_certificate_key +':/etc/nginx/awxweb_key.pem:ro' }}" + {% elif (ssl_certificate is defined) and (ssl_certificate_key is not defined) %} - "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}" {% endif %} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %} diff --git a/installer/roles/local_docker/templates/nginx.conf.j2 b/installer/roles/local_docker/templates/nginx.conf.j2 index 78c513f49d..0c93510bc9 100644 --- a/installer/roles/local_docker/templates/nginx.conf.j2 +++ b/installer/roles/local_docker/templates/nginx.conf.j2 @@ -47,7 +47,12 @@ http { {%endif %} server { - {% if ssl_certificate is defined %} + {% if (ssl_certificate is defined) and (ssl_certificate_key is defined) %} + listen 8053 ssl; + + ssl_certificate /etc/nginx/awxweb.pem; + ssl_certificate_key /etc/nginx/awxweb_key.pem; + {% elif (ssl_certificate is defined) and (ssl_certificate_key is not defined) %} listen 8053 ssl; ssl_certificate /etc/nginx/awxweb.pem;