diff options
| author | softwarefactory-project-zuul[bot] <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> | 2019-10-27 16:35:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 16:35:47 +0100 |
| commit | 4ed4d85b91e031325a04e21086a3284a0dd974fd (patch) | |
| tree | 4ded692363660149aba7b2f698f9668b5ce2cb84 /installer/roles | |
| parent | Merge pull request #5117 from ryanpetrello/runner-1-4-4 (diff) | |
| parent | Add quotes to shell variables with user input (diff) | |
| download | awx-4ed4d85b91e031325a04e21086a3284a0dd974fd.tar.xz awx-4ed4d85b91e031325a04e21086a3284a0dd974fd.zip | |
Merge pull request #5123 from r-daneel/devel
Add quote filter to shell variables
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
Diffstat (limited to 'installer/roles')
| -rw-r--r-- | installer/roles/local_docker/templates/environment.sh.j2 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/installer/roles/local_docker/templates/environment.sh.j2 b/installer/roles/local_docker/templates/environment.sh.j2 index 7d78b8c96f..832f112d6d 100644 --- a/installer/roles/local_docker/templates/environment.sh.j2 +++ b/installer/roles/local_docker/templates/environment.sh.j2 @@ -1,12 +1,12 @@ -DATABASE_USER={{ pg_username }} -DATABASE_NAME={{ pg_database }} -DATABASE_HOST={{ pg_hostname|default('postgres') }} -DATABASE_PORT={{ pg_port|default('5432') }} -DATABASE_PASSWORD={{ pg_password|default('awxpass') }} -DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass') }} +DATABASE_USER={{ pg_username|quote }} +DATABASE_NAME={{ pg_database|quote }} +DATABASE_HOST={{ pg_hostname|default('postgres')|quote }} +DATABASE_PORT={{ pg_port|default('5432')|quote }} +DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }} +DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass')|quote }} MEMCACHED_HOST={{ memcached_hostname|default('memcached') }} -MEMCACHED_PORT={{ memcached_port|default('11211') }} -RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq') }} -RABBITMQ_PORT={{ rabbitmq_port|default('5672') }} -AWX_ADMIN_USER={{ admin_user }} -AWX_ADMIN_PASSWORD={{ admin_password | quote }} +MEMCACHED_PORT={{ memcached_port|default('11211')|quote }} +RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq')|quote }} +RABBITMQ_PORT={{ rabbitmq_port|default('5672')|quote }} +AWX_ADMIN_USER={{ admin_user|quote }} +AWX_ADMIN_PASSWORD={{ admin_password|quote }} |