The answer to these is: it's good to have them in both places. The role defines the obvious things it depends on (not knowing what setup it will find itself into), and then `group_vars/matrix_servers` "extends" it based on everything else it knows (the homeserver being Synapse, whether or not the internal Postgres server is being used, etc.)pull/686/head
| @@ -265,7 +265,6 @@ matrix_mautrix_hangouts_database_password: "{{ matrix_synapse_macaroon_secret_ke | |||||
| # We don't enable bridges by default. | # We don't enable bridges by default. | ||||
| matrix_mautrix_signal_enabled: false | matrix_mautrix_signal_enabled: false | ||||
| # TODO: unclear whether to put this into the role or keep it here | |||||
| matrix_mautrix_signal_systemd_required_services_list: | | matrix_mautrix_signal_systemd_required_services_list: | | ||||
| {{ | {{ | ||||
| ['docker.service'] | ['docker.service'] | ||||
| @@ -288,8 +287,7 @@ matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | | |||||
| matrix_mautrix_signal_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_signal_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_signal_database_engine: 'postgres' | matrix_mautrix_signal_database_engine: 'postgres' | ||||
| matrix_mautrix_signal_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mau.signal.db') | to_uuid }}" | |||||
| matrix_mautrix_signal_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mau.signal.db') | to_uuid }}" | |||||
| ###################################################################### | ###################################################################### | ||||
| # | # | ||||
| @@ -1073,9 +1071,9 @@ matrix_postgres_additional_databases: | | |||||
| }] if (matrix_mautrix_hangouts_enabled and matrix_mautrix_hangouts_database_engine == 'postgres' and matrix_mautrix_hangouts_database_hostname == 'matrix-postgres') else []) | }] if (matrix_mautrix_hangouts_enabled and matrix_mautrix_hangouts_database_engine == 'postgres' and matrix_mautrix_hangouts_database_hostname == 'matrix-postgres') else []) | ||||
| + | + | ||||
| ([{ | ([{ | ||||
| 'name': matrix_mautrix_signal_database_name, | |||||
| 'username': matrix_mautrix_signal_database_username, | |||||
| 'password': matrix_mautrix_signal_database_password, | |||||
| 'name': matrix_mautrix_signal_database_name, | |||||
| 'username': matrix_mautrix_signal_database_username, | |||||
| 'password': matrix_mautrix_signal_database_password, | |||||
| }] if (matrix_mautrix_signal_enabled and matrix_mautrix_signal_database_engine == 'postgres' and matrix_mautrix_signal_database_hostname == 'matrix-postgres') else []) | }] if (matrix_mautrix_signal_enabled and matrix_mautrix_signal_database_engine == 'postgres' and matrix_mautrix_signal_database_hostname == 'matrix-postgres') else []) | ||||
| + | + | ||||
| ([{ | ([{ | ||||
| @@ -27,8 +27,7 @@ matrix_mautrix_signal_container_http_host_bind_port: '' | |||||
| matrix_mautrix_signal_container_extra_arguments: [] | matrix_mautrix_signal_container_extra_arguments: [] | ||||
| # List of systemd services that matrix-mautrix-signal.service depends on. | # List of systemd services that matrix-mautrix-signal.service depends on. | ||||
| # TODO: unclear whether to put this into group_vars or keep it here | |||||
| matrix_mautrix_signal_systemd_required_services_list: | |||||
| matrix_mautrix_signal_systemd_required_services_list: | |||||
| - 'docker.service' | - 'docker.service' | ||||
| - 'matrix-mautrix-signal-daemon.service' | - 'matrix-mautrix-signal-daemon.service' | ||||
| @@ -40,7 +39,7 @@ matrix_mautrix_signal_homeserver_token: '' | |||||
| # Database-related configuration fields | # Database-related configuration fields | ||||
| # | # | ||||
| # This bridge only supports postgres. | |||||
| # This bridge only supports postgres. | |||||
| # | # | ||||
| matrix_mautrix_signal_database_engine: 'postgres' | matrix_mautrix_signal_database_engine: 'postgres' | ||||
| @@ -50,13 +49,13 @@ matrix_mautrix_signal_database_hostname: 'matrix-postgres' | |||||
| matrix_mautrix_signal_database_port: 5432 | matrix_mautrix_signal_database_port: 5432 | ||||
| matrix_mautrix_signal_database_name: 'matrix_mautrix_signal' | matrix_mautrix_signal_database_name: 'matrix_mautrix_signal' | ||||
| matrix_mautrix_signal_database_connection_string: 'postgres://{{ matrix_mautrix_signal_database_username }}:{{ matrix_mautrix_signal_database_password }}@{{ matrix_mautrix_signal_database_hostname }}:{{ matrix_mautrix_signal_database_port }}/{{ matrix_mautrix_signal_database_name }}' | |||||
| matrix_mautrix_signal_database_connection_string: 'postgres://{{ matrix_mautrix_signal_database_username }}:{{ matrix_mautrix_signal_database_password }}@{{ matrix_mautrix_signal_database_hostname }}:{{ matrix_mautrix_signal_database_port }}/{{ matrix_mautrix_signal_database_name }}' | |||||
| matrix_mautrix_signal_appservice_database: "{{ | |||||
| { | |||||
| 'postgres': matrix_mautrix_facebook_database_connection_string, | |||||
| }[matrix_mautrix_signal_database_engine] | |||||
| }}" | |||||
| matrix_mautrix_signal_appservice_database: "{{ | |||||
| { | |||||
| 'postgres': matrix_mautrix_facebook_database_connection_string, | |||||
| }[matrix_mautrix_signal_database_engine] | |||||
| }}" | |||||
| # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth). | # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth). | ||||
| matrix_mautrix_signal_login_shared_secret: '' | matrix_mautrix_signal_login_shared_secret: '' | ||||
| @@ -96,4 +95,4 @@ matrix_mautrix_signal_registration_yaml: "{{ lookup('template', 'templates/regis | |||||
| matrix_mautrix_signal_registration: "{{ matrix_mautrix_signal_registration_yaml|from_yaml }}" | matrix_mautrix_signal_registration: "{{ matrix_mautrix_signal_registration_yaml|from_yaml }}" | ||||
| matrix_mautrix_signal_log_level: 'DEBUG' | |||||
| matrix_mautrix_signal_log_level: 'DEBUG' | |||||