pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Jinja2 interpolation for some default variables

Browse source 
We're overriding these in the correct way in `group_vars/matrix_servers`
so this wasn't causing any problem in practice.
This commit is contained in:
Slavi Pantaleev 2022-10-20 15:46:02 +03:00
parent 80da7dfb0b
commit af3a32cf6a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/matrix-postgres/defaults/main.yml
View file

@ -68,7 +68,7 @@ matrix_postgres_additional_databases: []
# If a dump file contains the roles and they've also been created beforehand (see `matrix_postgres_additional_databases`), # If a dump file contains the roles and they've also been created beforehand (see `matrix_postgres_additional_databases`),
# importing would fail. # importing would fail.
# We either need to not create them or to ignore the `CREATE ROLE` statements in the dump. # We either need to not create them or to ignore the `CREATE ROLE` statements in the dump.
matrix_postgres_import_roles_to_ignore: [matrix_postgres_connection_username] matrix_postgres_import_roles_to_ignore: "{{ [matrix_postgres_connection_username] }}"
# When importing an existing Postgres database (when restoring a backup) or when doing a Postgres upgrade (which dumps & restores), we'd like to avoid: # When importing an existing Postgres database (when restoring a backup) or when doing a Postgres upgrade (which dumps & restores), we'd like to avoid:
# - creating users (`CREATE ROLE ..`) # - creating users (`CREATE ROLE ..`)
@ -85,7 +85,7 @@ matrix_postgres_import_roles_ignore_regex: "^(CREATE|ALTER) ROLE ({{ matrix_post
# If a dump file contains the databases and they've also been created beforehand (see `matrix_postgres_additional_databases`), # If a dump file contains the databases and they've also been created beforehand (see `matrix_postgres_additional_databases`),
# importing would fail. # importing would fail.
# We either need to not create them or to ignore the `CREATE DATABASE` statements in the dump. # We either need to not create them or to ignore the `CREATE DATABASE` statements in the dump.
matrix_postgres_import_databases_to_ignore: [matrix_postgres_db_name] matrix_postgres_import_databases_to_ignore: "{{ [matrix_postgres_db_name] }}"
matrix_postgres_import_databases_ignore_regex: "^CREATE DATABASE ({{ matrix_postgres_import_databases_to_ignore | join('|') }})\\s" # noqa jinja[spacing] matrix_postgres_import_databases_ignore_regex: "^CREATE DATABASE ({{ matrix_postgres_import_databases_to_ignore | join('|') }})\\s" # noqa jinja[spacing]