External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added variable to inventory to add a separate key file

Browse Source
This commit is contained in:
ggiinnoo
2020-04-28 11:13:47 +02:00
parent c2e9df74e4
commit 41a8d32dcc
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/inventory
View File

@@ -66,6 +66,8 @@ postgres_data_dir="~/.awx/pgdocker"
host_port=80 host_port=80
host_port_ssl=443 host_port_ssl=443
#ssl_certificate= #ssl_certificate=
# Optional key file
#ssl_certificate_key=
docker_compose_dir="~/.awx/awxcompose" docker_compose_dir="~/.awx/awxcompose"
# Required for Openshift when building the image on your own # Required for Openshift when building the image on your own

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

@@ -38,7 +38,10 @@ services:
{% if ca_trust_dir is defined %} {% if ca_trust_dir is defined %}
- "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}"
{% endif %} {% 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' }}" - "{{ ssl_certificate +':/etc/nginx/awxweb.pem:ro' }}"
{% endif %} {% 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) %}

7
installer/roles/local_docker/templates/nginx.conf.j2
View File

@@ -47,7 +47,12 @@ http {
{%endif %} {%endif %}
server { 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 if (ssl_certificate is defined) and (ssl_certificate_key is not defined) %}
listen 8053 ssl; listen 8053 ssl;
ssl_certificate /etc/nginx/awxweb.pem; ssl_certificate /etc/nginx/awxweb.pem;