From ab747f302d79dd7f4c4be6998c1f662639990509 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Sat, 17 Aug 2024 11:32:07 +0200
Subject: [PATCH] fix(mycloud-matrix): upgrade signal bridge

Signed-off-by: WrenIX <dev@wrenix.eu>
---
 mycloud-matrix/templates/bridge/signal.yaml | 55 +++++++++++----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/mycloud-matrix/templates/bridge/signal.yaml b/mycloud-matrix/templates/bridge/signal.yaml
index 2b618ae..16ba6b6 100644
--- a/mycloud-matrix/templates/bridge/signal.yaml
+++ b/mycloud-matrix/templates/bridge/signal.yaml
@@ -36,37 +36,28 @@ spec:
     - kind: Secret
       name: "{{ .Release.Name }}-doublepuppet"
       valuesKey: as_token_code
-      targetPath: config.bridge.login_shared_secret_map.{{ include "mycloud-matrix.domain" . | replace "." "\\." }}
+      targetPath: config.double_puppet.secrets.{{ include "mycloud-matrix.domain" . | replace "." "\\." }}
   values:
+    image:
+      repository: "mautrix/signal@sha256"
+      tag: "98c72b3918ac8b970257305127580cd37549201da90cd64307d406aa5c176c1b"
     config:
+      database:
+        type: postgres
+        {{- $username := .Values.databases.bridge.signal.username  }}
+        {{- $password := .Values.databases.bridge.signal.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-bridge-signal" "database_password" | b64enc) }}
+        {{- $host := .Values.databases.bridge.signal.host }}
+        {{- $database := .Values.databases.bridge.signal.name }}
+        uri: {{ printf "postgres://%s:%s@%s/%s?sslmode=disable" $username $password $host $database | quote }}
       homeserver:
         address: https://{{ include "mycloud-matrix.host.server" . }}
         domain: {{ include "mycloud-matrix.domain" . }}
       appservice:
         address: http://{{ .Release.Name }}-mautrix-signal:29328
-        database:
-          type: postgres
-          {{- $username := .Values.databases.bridge.signal.username  }}
-          {{- $password := .Values.databases.bridge.signal.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-bridge-signal" "database_password" | b64enc) }}
-          {{- $host := .Values.databases.bridge.signal.host }}
-          {{- $database := .Values.databases.bridge.signal.name }}
-          uri: {{ printf "postgres://%s:%s@%s/%s?sslmode=disable" $username $password $host $database | quote }}
       bridge:
         personal_filtering_spaces: true
-        sync_direct_chat_list: true
-        double_puppet_server_map:
-          example.com: null
-          {{ include "mycloud-matrix.domain" . }}: https://{{ include "mycloud-matrix.host.server" . }}
-        login_shared_secret_map:
-          example.com: null
-        {{- if not .Values.server.authenticationService.enabled }}
-        encryption:
-          allow: true
-          default: true
-          require: true
-          delete_keys:
-            periodically_delete_expired: true
-        {{- end }}
+        relay:
+          enabled: true
         permissions:
           "example.com": null
           "@admin:example.com": null
@@ -74,9 +65,23 @@ spec:
           {{- range $user := .Values.bridge.signal.admins }}
           {{ $user | quote }}: admin
           {{- end }}
-        relay:
-          enabled: true
-
+      matrix:
+        sync_direct_chat_list: true
+      double_puppet:
+        servers:
+          example.com: null
+          {{ include "mycloud-matrix.domain" . }}: https://{{ include "mycloud-matrix.host.server" . }}
+        secrets:
+          example.com: null
+      {{- if not .Values.server.authenticationService.enabled }}
+      encryption:
+        allow: true
+        default: true
+        require: true
+        delete_keys:
+          periodically_delete_expired: true
+      {{- end }}
+  
     registration:
       namespaces:
         users: