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

Make Postgres import not break for databases with special names

Browse Source 
We haven't encountered such a problem yet, but it doesn't hurt to
make things more robust.
This commit is contained in:
Slavi Pantaleev 2022-10-21 11:25:30 +03:00
parent 0b44ec19b4
commit ff0fc88fae
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,9 @@ matrix_postgres_import_roles_to_ignore: |
# which is unsupported by default by newer Postgres versions (v14+). # which is unsupported by default by newer Postgres versions (v14+).
# When users are created and passwords are set by the playbook, they end up hashed as `scram-sha-256` on Postgres v14+. # When users are created and passwords are set by the playbook, they end up hashed as `scram-sha-256` on Postgres v14+.
# If an md5-hashed password is restored on top, Postgres v14+ will refuse to authenticate users with it by default. # If an md5-hashed password is restored on top, Postgres v14+ will refuse to authenticate users with it by default.
matrix_postgres_import_roles_ignore_regex: "^(CREATE|ALTER) ROLE ({{ matrix_postgres_import_roles_to_ignore | join('|') }})(;| WITH)" # noqa jinja[spacing] #
# We also allow for the role name to be quoted, which is rare, but might happen for role names which are special keywords (e.g. `default`).
matrix_postgres_import_roles_ignore_regex: "^(CREATE|ALTER) ROLE \\\"?({{ matrix_postgres_import_roles_to_ignore | join('|') }})\\\"?(;| WITH)" # noqa jinja[spacing]
# A list of databases to avoid creating when importing (or upgrading) the database. # A list of databases to avoid creating when importing (or upgrading) the database.
# 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`),
@ -97,7 +99,8 @@ matrix_postgres_import_databases_to_ignore: |
matrix_postgres_additional_databases|map(attribute='name') | list matrix_postgres_additional_databases|map(attribute='name') | list
}} }}
matrix_postgres_import_databases_ignore_regex: "^CREATE DATABASE ({{ matrix_postgres_import_databases_to_ignore | join('|') }})\\s" # noqa jinja[spacing] # 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`).
matrix_postgres_import_databases_ignore_regex: "^CREATE DATABASE \\\"?({{ matrix_postgres_import_databases_to_ignore | join('|') }})\\\"?\\s" # noqa jinja[spacing]
# The number of seconds to wait after starting `matrix-postgres.service` # The number of seconds to wait after starting `matrix-postgres.service`
# and before trying to run queries for creating additional databases/users against it. # and before trying to run queries for creating additional databases/users against it.