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

Remove some TODOs

Browse Source 
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.)
This commit is contained in:
Slavi Pantaleev 2021-01-03 07:46:55 +02:00
parent 84cac25c11
commit df8d9cfd34
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/matrix_servers
View File

@ -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']
@ -290,7 +289,6 @@ matrix_mautrix_signal_login_shared_secret: "{{ matrix_synapse_ext_password_provi
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 }}"
###################################################################### ######################################################################
# #
# /matrix-bridge-mautrix-signal # /matrix-bridge-mautrix-signal

1
roles/matrix-bridge-mautrix-signal/defaults/main.yml
View File

@ -27,7 +27,6 @@ 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'