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

- removed matrix_postgres_backup_db_list variable

Browse source 
- add matrix_postgres_backup_databases to be build on top of matrix_postgres_additional_databases
- POSTGRES_DB is now directly set from matrix_postgres_backup_databases while building the templates/env-postgres-backup.j2
This commit is contained in:
foxcris 2021-03-16 11:40:16 +01:00
parent 43f7d9afb6
commit 11cd1cb0fa
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
group_vars/matrix_servers
View file

@ -1419,7 +1419,17 @@ matrix_postgres_backup_connection_port: "{{ matrix_postgres_connection_port }}"
matrix_postgres_backup_connection_username: "{{ matrix_postgres_connection_username }}" matrix_postgres_backup_connection_username: "{{ matrix_postgres_connection_username }}"
matrix_postgres_backup_connection_password: "{{ matrix_postgres_connection_password }}" matrix_postgres_backup_connection_password: "{{ matrix_postgres_connection_password }}"
matrix_postgres_backup_db_list: "{{ matrix_postgres_additional_databases|map(attribute='name')|join(', ') }}" # the default matrix synapse databse is not always part of the matrix_postgres_additional_databases variable thus we have to add it if the default database is used
matrix_postgres_backup_databases: |
{{
([{
'name': matrix_synapse_database_database,
'username': matrix_synapse_database_user,
'password': matrix_synapse_database_password,
}] if (matrix_synapse_enabled and matrix_synapse_database_database == matrix_postgres_db_name and matrix_synapse_database_host == 'matrix-postgres') else [])
+
matrix_postgres_additional_databases
}}
###################################################################### ######################################################################
# #

3
roles/matrix-postgres-backup/defaults/main.yml
View file

@ -5,8 +5,6 @@ matrix_postgres_backup_connection_port: 5432
matrix_postgres_backup_connection_username: "matrix" matrix_postgres_backup_connection_username: "matrix"
matrix_postgres_backup_connection_password: "" matrix_postgres_backup_connection_password: ""
matrix_postgres_backup_db_list: ""
matrix_postgres_backup_extra_opts: "-Z9 --schema=public --blobs" matrix_postgres_backup_extra_opts: "-Z9 --schema=public --blobs"
matrix_postgres_backup_schedule: "@daily" matrix_postgres_backup_schedule: "@daily"
matrix_postgres_backup_keep_days: "7" matrix_postgres_backup_keep_days: "7"
@ -15,6 +13,7 @@ matrix_postgres_backup_keep_months: "12"
matrix_postgres_backup_healthcheck_port: "8080" matrix_postgres_backup_healthcheck_port: "8080"
matrix_postgres_backup_db_list: "" matrix_postgres_backup_db_list: ""
matrix_postgres_backup_path: "{{ matrix_base_data_path }}/postgres-backup" matrix_postgres_backup_path: "{{ matrix_base_data_path }}/postgres-backup"
matrix_postgres_backup_databases: ""
matrix_postgres_base_path: "{{ matrix_base_data_path }}/postgres" matrix_postgres_base_path: "{{ matrix_base_data_path }}/postgres"
matrix_postgres_data_path: "{{ matrix_postgres_base_path }}/data" matrix_postgres_data_path: "{{ matrix_postgres_base_path }}/data"

2
roles/matrix-postgres-backup/tasks/validate_config.yml
View file

@ -15,4 +15,4 @@
- "matrix_postgres_backup_keep_weeks" - "matrix_postgres_backup_keep_weeks"
- "matrix_postgres_backup_keep_months" - "matrix_postgres_backup_keep_months"
- "matrix_postgres_backup_path" - "matrix_postgres_backup_path"
- "matrix_postgres_backup_db_list" - "matrix_postgres_backup_databases"

2
roles/matrix-postgres-backup/templates/env-postgres-backup.j2
View file

@ -2,7 +2,7 @@
POSTGRES_USER={{ matrix_postgres_backup_connection_username }} POSTGRES_USER={{ matrix_postgres_backup_connection_username }}
POSTGRES_PASSWORD={{ matrix_postgres_backup_connection_password }} POSTGRES_PASSWORD={{ matrix_postgres_backup_connection_password }}
POSTGRES_HOST={{ matrix_postgres_backup_connection_hostname }} POSTGRES_HOST={{ matrix_postgres_backup_connection_hostname }}
POSTGRES_DB={{ matrix_postgres_backup_db_list }} POSTGRES_DB={{ matrix_postgres_backup_databases|map(attribute='name')|join(', ') }}
POSTGRES_EXTRA_OPTS={{ matrix_postgres_backup_extra_opts }} POSTGRES_EXTRA_OPTS={{ matrix_postgres_backup_extra_opts }}
SCHEDULE={{ matrix_postgres_backup_schedule }} SCHEDULE={{ matrix_postgres_backup_schedule }}
BACKUP_KEEP_DAYS={{ matrix_postgres_backup_keep_days }} BACKUP_KEEP_DAYS={{ matrix_postgres_backup_keep_days }}