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

- matrix_postgres_backup_databases now uses more simple structure

Browse source
This commit is contained in:
foxcris 2021-04-05 09:05:41 +02:00
parent 76fbc59b61
commit 2178f3612f
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
group_vars/matrix_servers
View file

@ -1422,13 +1422,11 @@ matrix_postgres_backup_connection_password: "{{ matrix_postgres_connection_passw
# 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 # 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: | matrix_postgres_backup_databases: |
{{ {{
([{ ([
'name': matrix_synapse_database_database, matrix_synapse_database_database,
'username': matrix_synapse_database_user, ] if (matrix_synapse_enabled and matrix_synapse_database_database == matrix_postgres_db_name and matrix_synapse_database_host == 'matrix-postgres') else [])
'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 matrix_postgres_additional_databases|map(attribute='name')
}} }}
###################################################################### ######################################################################

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

@ -11,9 +11,8 @@ matrix_postgres_backup_keep_days: "7"
matrix_postgres_backup_keep_weeks: "4" matrix_postgres_backup_keep_weeks: "4"
matrix_postgres_backup_keep_months: "12" 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_databases: []
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/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_databases|map(attribute='name')|join(', ') }} POSTGRES_DB={{ matrix_postgres_backup_databases|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 }}