1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00

Merge pull request #5123 from r-daneel/devel

Add quote filter to shell variables

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-10-27 15:35:47 +00:00 committed by GitHub
commit 4ed4d85b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,12 +1,12 @@
DATABASE_USER={{ pg_username }} DATABASE_USER={{ pg_username|quote }}
DATABASE_NAME={{ pg_database }} DATABASE_NAME={{ pg_database|quote }}
DATABASE_HOST={{ pg_hostname|default('postgres') }} DATABASE_HOST={{ pg_hostname|default('postgres')|quote }}
DATABASE_PORT={{ pg_port|default('5432') }} DATABASE_PORT={{ pg_port|default('5432')|quote }}
DATABASE_PASSWORD={{ pg_password|default('awxpass') }} DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }}
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass') }} DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass')|quote }}
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }} MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
MEMCACHED_PORT={{ memcached_port|default('11211') }} MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq') }} RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq')|quote }}
RABBITMQ_PORT={{ rabbitmq_port|default('5672') }} RABBITMQ_PORT={{ rabbitmq_port|default('5672')|quote }}
AWX_ADMIN_USER={{ admin_user }} AWX_ADMIN_USER={{ admin_user|quote }}
AWX_ADMIN_PASSWORD={{ admin_password | quote }} AWX_ADMIN_PASSWORD={{ admin_password|quote }}