From a98ede44c7c27c42e9e3498dfd8075129cd4abc3 Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish+git@lakhwara.com>
Date: Mon, 2 Jan 2023 19:57:23 +1000
Subject: [PATCH] fix mautrix signal service use my-discord-mautrix

---
 hosts/profiles/matrix/default.nix          | 4 ++++
 hosts/profiles/matrix/mautrix-services.nix | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hosts/profiles/matrix/default.nix b/hosts/profiles/matrix/default.nix
index ab6f6920..f269b7d0 100644
--- a/hosts/profiles/matrix/default.nix
+++ b/hosts/profiles/matrix/default.nix
@@ -41,11 +41,15 @@
           tls = false;
         }
       ];
+
       app_service_config_files = [
         #   The registration file is automatically generated after starting the appservice for the first time.
         #   cp /var/lib/matrix-appservice-discord/discord-registration.yaml /var/lib/matrix-synapse/
         #   chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/discord-registration.yaml
         "/var/lib/matrix-synapse/telegram-registration.yaml"
+        "/var/lib/matrix-synapse/signal-registration.yaml"
+        "/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
+        "/var/lib/matrix-as-discord/discord-registration.yaml"
         # "/var/lib/matrix-synapse/slack-registration.yaml"
         # "/var/lib/matrix-synapse/discord-registration.yaml"
         # "/var/lib/matrix-synapse/whatsapp-registration.yaml"
diff --git a/hosts/profiles/matrix/mautrix-services.nix b/hosts/profiles/matrix/mautrix-services.nix
index 19bd00bd..0cfad4b3 100644
--- a/hosts/profiles/matrix/mautrix-services.nix
+++ b/hosts/profiles/matrix/mautrix-services.nix
@@ -28,7 +28,7 @@
       discord = {
         port = 29188;
         format = "mautrix-go";
-        package = pkgs.mautrix-discord;
+        package = pkgs.my-mautrix-discord;
       };
 
       signal = {
@@ -38,6 +38,9 @@
         serviceConfig = {
           StateDirectory = [ "matrix-as-signal" "signald" ];
           SupplementaryGroups = [ "signald" ];
+          TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
+          User = lib.mkForce config.services.signald.user;
+          Group = lib.mkForce config.services.signald.group;
         };
         settings.signal = {
           socket_path = config.services.signald.socketPath;