finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use unique filter for matrix_postgres_import_roles_to_ignore and matrix_postgres_import_databases_to_ignore

Browse Source 
Dendrite uses a lot of databases, but a single (`dendrite`) role, which
leads to `matrix_postgres_import_roles_to_ignore` being something like
`['dendrite', 'dendrite', 'dendrite', ...]` needlessly.

This leads to weird regexes being generated for
`matrix_postgres_import_roles_ignore_regex`.
It's not that it hurts, but it just looks odd.
This commit is contained in:
Slavi Pantaleev 2022-11-01 15:47:00 +02:00
parent a4662660d2
commit 125ca5569d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
roles/matrix-postgres/defaults/main.yml
View File

@ -74,9 +74,11 @@ matrix_postgres_additional_databases: []
# 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_import_roles_to_ignore: |
{{ {{
[matrix_postgres_connection_username] (
+ [matrix_postgres_connection_username]
matrix_postgres_additional_databases|map(attribute='username') | list +
matrix_postgres_additional_databases|map(attribute='username') | list
) | unique
}} }}
# 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:
@ -98,9 +100,11 @@ matrix_postgres_import_roles_ignore_regex: "^(CREATE|ALTER) ROLE \\\"?({{ matrix
# 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_import_databases_to_ignore: |
{{ {{
[matrix_postgres_db_name] (
+ [matrix_postgres_db_name]
matrix_postgres_additional_databases|map(attribute='name') | list +
matrix_postgres_additional_databases|map(attribute='name') | list
) | unique
}} }}
# We also allow for the database name to be quoted, which is rare, but might happen for database names which are special keywords (e.g. `default`). # We also allow for the database name to be quoted, which is rare, but might happen for database names which are special keywords (e.g. `default`).