From bff6fe9b09ddd822f056c4110d029a68b000dba3 Mon Sep 17 00:00:00 2001
From: vdietrich <valentin.dietrich@lambda-online.de>
Date: Thu, 16 Jan 2025 14:15:04 +0100
Subject: [PATCH] updated signal bridge to 0.7.5 and added env var for default
 encry bridge2server

---
 .env.sample             | 1 +
 compose.signal.yml      | 3 ++-
 signal_bridge.yaml.tmpl | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index efe5ebc..b6fcd64 100644
--- a/.env.sample
+++ b/.env.sample
@@ -159,6 +159,7 @@ RETENTION_MAX_LIFETIME=4w
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.signal.yml"
 #SIGNAL_ENABLE_ENCRYPTION=true
+#SIGNAL_DEFAULT_ENCRYPTION=true
 #SIGNAL_BRIDGE_PERMISSIONS="{ \"*\": \"relay\" }"
 #SECRET_SIGNAL_AS_TOKEN_VERSION=v1
 #SECRET_SIGNAL_DB_PASSWORD_VERSION=v1
diff --git a/compose.signal.yml b/compose.signal.yml
index d97eb12..1625730 100644
--- a/compose.signal.yml
+++ b/compose.signal.yml
@@ -10,7 +10,7 @@ services:
       - signal-data:/signal-data
 
   signalbridge:
-    image: dock.mau.dev/mautrix/signal:v0.7.2
+    image: dock.mau.dev/mautrix/signal:v0.7.5
     depends_on:
       - signaldb
     configs:
@@ -21,6 +21,7 @@ services:
       - HOMESERVER_URL
       - SIGNAL_BRIDGE_PERMISSIONS
       - SIGNAL_ENABLE_ENCRYPTION
+      - SIGNAL_DEFAULT_ENCRYPTION=${SIGNAL_DEFAULT_ENCRYPTION:-false}
       - VERIFY_SSL
     secrets:
       - signal_as_token
diff --git a/signal_bridge.yaml.tmpl b/signal_bridge.yaml.tmpl
index 14ff0a4..dd37692 100644
--- a/signal_bridge.yaml.tmpl
+++ b/signal_bridge.yaml.tmpl
@@ -329,7 +329,7 @@ encryption:
     # Whether to enable encryption at all. If false, the bridge will not function in encrypted rooms.
     allow: {{ env "SIGNAL_ENABLE_ENCRYPTION" }}
     # Whether to force-enable encryption in all bridged rooms.
-    default: false
+    default: {{ env "SIGNAL_DEFAULT_ENCRYPTION" }}
     # Whether to require all messages to be encrypted and drop any unencrypted messages.
     require: false
     # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.