From 7a54e1109066ea5960c772de34ae7461be7a304d Mon Sep 17 00:00:00 2001
From: Sabine <sabinbox@laszakovits.net>
Date: Sat, 24 Oct 2020 12:15:03 +0200
Subject: [PATCH] started moving settings to group_vars

---
 group_vars/matrix_servers                     | 25 +++++++++++++++++++
 .../defaults/main.yml                         |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 00cdbdfb..00936700 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -241,7 +241,32 @@ matrix_mautrix_hangouts_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 ######################################################################
 
 
+######################################################################
+#
+# matrix-bridge-mautrix-signal
+#
+######################################################################
 
+matrix_mautrix_signal_enabled: false
+
+matrix_mautrix_signal_systemd_required_services_list: |
+  {{
+    ['docker.service']
+    +
+    (['matrix-synapse.service'] if matrix_synapse_enabled else [])
+  }}
+
+matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.as.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-bridge-mautrix-signal
+#
+######################################################################
 
 
 ######################################################################
diff --git a/roles/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
index d86bdb59..d034cab1 100644
--- a/roles/matrix-bridge-mautrix-signal/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
@@ -1,7 +1,7 @@
 # mautrix-telegram is a Matrix <-> Telegram bridge
 # See: https://github.com/tulir/mautrix-telegram
 
-matrix_mautrix_signal_enabled: false
+matrix_mautrix_signal_enabled: true
 
 # See: https://mau.dev/tulir/mautrix-signal/container_registry
 matrix_mautrix_signal_docker_image: "dock.mau.dev/tulir/mautrix-signal:latest"
@@ -41,7 +41,7 @@ matrix_mautrix_signal_container_extra_arguments: []
 # List of systemd services that matrix-mautrix-signal.service depends on.
 matrix_mautrix_signal_systemd_required_services_list: ['docker.service', 'matrix-mautrix-signal-daemon.service', 'matrix-mautrix-signal-db.service']
 
-# List of systemd services that matrix-mautrix-telegram.service wants
+# List of systemd services that matrix-mautrix-signal.service wants
 matrix_mautrix_signal_systemd_wanted_services_list: []
 
 matrix_mautrix_signal_appservice_token: ''