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

Merge pull request #3040 from jiuka/709-support-ssl-connections-for-postgresql

Browse Source 
Add pg_sslmode option to access PostgreSQL by ssl

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-01-22 16:51:41 +00:00
committed by GitHub
parent 91ae343e3b 072919040b
commit b7ba280da3
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/inventory
View File

@@ -85,6 +85,7 @@ pg_username=awx
pg_password=awxpass pg_password=awxpass
pg_database=awx pg_database=awx
pg_port=5432 pg_port=5432
#pg_sslmode=require
# RabbitMQ Configuration # RabbitMQ Configuration
rabbitmq_password=awxpass rabbitmq_password=awxpass

3
installer/roles/image_build/files/settings.py
View File

@@ -84,6 +84,9 @@ DATABASES = {
} }
} }
if os.getenv("DATABASE_SSLMODE", False):
DATABASES['default']['OPTIONS'] = {'sslmode': os.getenv("DATABASE_SSLMODE")}
BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
os.getenv("RABBITMQ_USER", None), os.getenv("RABBITMQ_USER", None),
os.getenv("RABBITMQ_PASSWORD", None), os.getenv("RABBITMQ_PASSWORD", None),

2
installer/roles/local_docker/tasks/standalone.yml
View File

@@ -104,6 +104,7 @@
DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_PASSWORD: "{{ pg_password }}"
DATABASE_PORT: "{{ pg_port }}" DATABASE_PORT: "{{ pg_port }}"
DATABASE_HOST: "{{ pg_hostname_actual }}" DATABASE_HOST: "{{ pg_hostname_actual }}"
DATABASE_SSLMODE: "{{ pg_sslmode | default(omit) }}"
RABBITMQ_USER: "{{ rabbitmq_default_username }}" RABBITMQ_USER: "{{ rabbitmq_default_username }}"
RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"
@@ -145,6 +146,7 @@
DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_PASSWORD: "{{ pg_password }}"
DATABASE_HOST: "{{ pg_hostname_actual }}" DATABASE_HOST: "{{ pg_hostname_actual }}"
DATABASE_PORT: "{{ pg_port }}" DATABASE_PORT: "{{ pg_port }}"
DATABASE_SSLMODE: "{{ pg_sslmode | default(omit) }}"
RABBITMQ_USER: "{{ rabbitmq_default_username }}" RABBITMQ_USER: "{{ rabbitmq_default_username }}"
RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"