diff --git a/installer/inventory b/installer/inventory index e64eef7f3a..b6c32e226e 100644 --- a/installer/inventory +++ b/installer/inventory @@ -85,6 +85,7 @@ pg_username=awx pg_password=awxpass pg_database=awx pg_port=5432 +#pg_sslmode=require # RabbitMQ Configuration rabbitmq_password=awxpass diff --git a/installer/roles/image_build/files/settings.py b/installer/roles/image_build/files/settings.py index e8fd788c00..298792db63 100644 --- a/installer/roles/image_build/files/settings.py +++ b/installer/roles/image_build/files/settings.py @@ -84,6 +84,9 @@ DATABASES = { } } +if os.getenv("DATABASE_SSLMODE", False): + DATABASES['default']['OPTIONS'] = {'sslmode': os.getenv("DATABASE_SSLMODE")} + BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( os.getenv("RABBITMQ_USER", None), os.getenv("RABBITMQ_PASSWORD", None), diff --git a/installer/roles/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml index ad7a064921..0b903c4a87 100644 --- a/installer/roles/local_docker/tasks/standalone.yml +++ b/installer/roles/local_docker/tasks/standalone.yml @@ -104,6 +104,7 @@ DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_PORT: "{{ pg_port }}" DATABASE_HOST: "{{ pg_hostname_actual }}" + DATABASE_SSLMODE: "{{ pg_sslmode | default(omit) }}" RABBITMQ_USER: "{{ rabbitmq_default_username }}" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}" RABBITMQ_HOST: "rabbitmq" @@ -145,6 +146,7 @@ DATABASE_PASSWORD: "{{ pg_password }}" DATABASE_HOST: "{{ pg_hostname_actual }}" DATABASE_PORT: "{{ pg_port }}" + DATABASE_SSLMODE: "{{ pg_sslmode | default(omit) }}" RABBITMQ_USER: "{{ rabbitmq_default_username }}" RABBITMQ_PASSWORD: "{{ rabbitmq_default_password }}" RABBITMQ_HOST: "rabbitmq"