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

Rework matrix_mautrix_twitter_database_* variables a bit

Browse Source 
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1682

Previously, when matrix-postgres was disabled, we were setting
`matrix_mautrix_twitter_database_engine` to an invalid empty value.

Now, we always hardcode `matrix_mautrix_twitter_database_engine: postgres`,
but set/unset the database hostname and password values instead.
This commit is contained in:
Slavi Pantaleev 2022-03-08 08:10:40 +02:00
parent 1bea072484
commit 8c25ade9fb
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/matrix_servers
View File

@ -558,10 +558,8 @@ matrix_mautrix_twitter_homeserver_token: "{{ matrix_homeserver_generic_secret_ke
matrix_mautrix_twitter_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}" matrix_mautrix_twitter_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
# We'd like to force-set people with external Postgres to SQLite, so the bridge role can complain matrix_mautrix_twitter_database_hostname: "{{ 'matrix-postgres' if matrix_postgres_enabled else '' }}"
# and point them to a migration path. matrix_mautrix_twitter_database_password: "{{ matrix_homeserver_generic_secret_key | password_hash('sha512', 'mau.twt.db') | to_uuid if matrix_postgres_enabled else '' }}"
matrix_mautrix_twitter_database_engine: "{{ 'postgres' if matrix_postgres_enabled else '' }}"
matrix_mautrix_twitter_database_password: "{{ matrix_homeserver_generic_secret_key | password_hash('sha512', 'mau.twt.db') | to_uuid }}"
###################################################################### ######################################################################
# #

4
roles/matrix-bridge-mautrix-twitter/defaults/main.yml
View File

@ -42,8 +42,8 @@ matrix_mautrix_twitter_homeserver_token: ''
matrix_mautrix_twitter_database_engine: 'postgres' matrix_mautrix_twitter_database_engine: 'postgres'
matrix_mautrix_twitter_database_username: 'matrix_mautrix_twitter' matrix_mautrix_twitter_database_username: 'matrix_mautrix_twitter'
matrix_mautrix_twitter_database_password: 'some-password' matrix_mautrix_twitter_database_password: ''
matrix_mautrix_twitter_database_hostname: 'matrix-postgres' matrix_mautrix_twitter_database_hostname: ''
matrix_mautrix_twitter_database_port: 5432 matrix_mautrix_twitter_database_port: 5432
matrix_mautrix_twitter_database_name: 'matrix_mautrix_twitter' matrix_mautrix_twitter_database_name: 'matrix_mautrix_twitter'

10
roles/matrix-bridge-mautrix-twitter/tasks/validate_config.yml
View File

@ -8,11 +8,5 @@
with_items: with_items:
- "matrix_mautrix_twitter_appservice_token" - "matrix_mautrix_twitter_appservice_token"
- "matrix_mautrix_twitter_homeserver_token" - "matrix_mautrix_twitter_homeserver_token"
- "matrix_mautrix_twitter_database_hostname"
- name: Fail if database is not defined - "matrix_mautrix_twitter_database_password"
fail:
msg: >-
You need to define a need to set `matrix_mautrix_twitter_database_engine: postgres` and redefine the other `matrix_mautrix_twitter_database_*` variables
when: "vars[item] == ''"
with_items:
- "matrix_mautrix_twitter_database_engine"