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

moved some settings from role to group_vars

Browse Source
This commit is contained in:
Sabine Laszakovits 2020-10-25 20:45:24 +01:00
parent ff1d7921a0
commit 9b890e9ced
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
group_vars/matrix_servers
View File

@ -257,11 +257,18 @@ matrix_mautrix_signal_systemd_required_services_list: |
}} }}
matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.as.token') | to_uuid }}" matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.as.token') | to_uuid }}"
matrix_mautrix_signal_homeserver_domain: '{{ matrix_domain }}'
matrix_mautrix_signal_homeserver_address: "{{ 'http://matrix-synapse:8008' if matrix_synapse_enabled else '' }}"
matrix_mautrix_signal_homeserver_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.hs.token') | to_uuid }}" matrix_mautrix_signal_homeserver_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.hs.token') | to_uuid }}"
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_db_user: 'signal-db-user'
matrix_mautrix_signal_db_password: 'signal-db-password'
matrix_mautrix_signal_db_database: 'signal-db'
###################################################################### ######################################################################
# #
# /matrix-bridge-mautrix-signal # /matrix-bridge-mautrix-signal

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

@ -25,8 +25,8 @@ matrix_mautrix_signal_daemon_path: "{{ matrix_mautrix_signal_base_path }}/signal
# # Example: /741a0483-ba17-4682-9900-30bd7269f1cc # # Example: /741a0483-ba17-4682-9900-30bd7269f1cc
# matrix_mautrix_telegram_public_endpoint: '' # matrix_mautrix_telegram_public_endpoint: ''
matrix_mautrix_signal_homeserver_address: 'http://matrix-synapse:8008' matrix_mautrix_signal_homeserver_address: ''
matrix_mautrix_signal_homeserver_domain: '{{ matrix_domain }}' matrix_mautrix_signal_homeserver_domain: ''
matrix_mautrix_signal_appservice_address: 'http://matrix-mautrix-signal:29328' matrix_mautrix_signal_appservice_address: 'http://matrix-mautrix-signal:29328'
# matrix_mautrix_telegram_appservice_public_external: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mautrix_telegram_public_endpoint }}' # matrix_mautrix_telegram_appservice_public_external: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mautrix_telegram_public_endpoint }}'

2
roles/matrix-bridge-mautrix-signal/tasks/validate_config.yml
View File

@ -7,6 +7,8 @@
when: "vars[item] == ''" when: "vars[item] == ''"
with_items: with_items:
- "matrix_mautrix_signal_appservice_token" - "matrix_mautrix_signal_appservice_token"
- "matrix_mautrix_signal_homeserver_domain"
- "matrix_mautrix_signal_homeserver_address"
- "matrix_mautrix_signal_homeserver_token" - "matrix_mautrix_signal_homeserver_token"
- "matrix_mautrix_signal_db_user" - "matrix_mautrix_signal_db_user"
- "matrix_mautrix_signal_db_password" - "matrix_mautrix_signal_db_password"