From f903b7972cdc19a461ea5c0f73020c9d572ecea5 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 1 Dec 2021 12:22:37 +0100
Subject: [PATCH] Try making signal bridge more robust

---
 nixos/roles/matrix-signal/mautrix-signal-module.nix | 3 ++-
 nixos/roles/matrix-signal/signald-module.nix        | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/roles/matrix-signal/mautrix-signal-module.nix b/nixos/roles/matrix-signal/mautrix-signal-module.nix
index b3ef11b0..1dd372f3 100644
--- a/nixos/roles/matrix-signal/mautrix-signal-module.nix
+++ b/nixos/roles/matrix-signal/mautrix-signal-module.nix
@@ -116,7 +116,6 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" "signald.service" ];
       after = [ "network-online.target" "signald.service" ];
-      bindsTo = [ "signald.service" ];
 
       preStart = ''
         old_umask=$(umask)
@@ -155,6 +154,8 @@ in
 
       serviceConfig = rec {
         Type = "simple";
+        WatchdogSignal = "SIGTERM";
+        WatchdogSec = "60m";
         Restart = "always";
 
         ProtectSystem = "full";
diff --git a/nixos/roles/matrix-signal/signald-module.nix b/nixos/roles/matrix-signal/signald-module.nix
index 28201401..37022a2a 100644
--- a/nixos/roles/matrix-signal/signald-module.nix
+++ b/nixos/roles/matrix-signal/signald-module.nix
@@ -39,6 +39,9 @@ in
 
       serviceConfig = {
         Type = "simple";
+        WatchdogSignal = "SIGTERM";
+        WatchdogSec = "60m";
+        Restart = "always";
 
         PermissionsStartOnly = true;
         RuntimeDirectory = "signald";
@@ -54,9 +57,6 @@ in
         StateDirectory = "signald";
         UMask = 0007;
 
-        WatchdogSignal = "SIGTERM";
-        WatchdogSec = "20m";
-        Restart = "always";
 
         ExecStart = ''
           ${pkgs.signald}/bin/signald \