rspamd: use --no-block to avoid deadlocking services

diff --git a/servers/mermet/rspamd.nix b/servers/mermet/rspamd.nix
index f47f9b3b720197e875ef94415ac3683b0540c2a1..3e1b7ea4270d4b70d6db5deff0174e5f4a8aba87 100644 (file)
--- a/servers/mermet/rspamd.nix
+++ b/servers/mermet/rspamd.nix
@@ -112,7 +112,7 @@ security.pass.secrets."rspamd/controller/hashedPassword" = {
   # Generated with: rspamadm pw
   user = rspamd.user;
   pipe = ''${pkgs.gnused}/bin/sed -e 's/.*/password = "\0";/' '';
-  postStart = "systemctl try-restart rspamd"; # rspamd does not support reloading so far
+  postStart = "systemctl try-restart --no-block rspamd"; # rspamd does not support reloading so far
 };
 systemd.services.rspamd = {
   wants = [ pass.secrets."rspamd/controller/hashedPassword".service ];

diff --git a/servers/mermet/rspamd/autogeree.net.nix b/servers/mermet/rspamd/autogeree.net.nix
index 0d1620b158537b7261d777db7d16c1345cc6902d..eeb2286dab5b569a225907f0a4c49195647436a9 100644 (file)
--- a/servers/mermet/rspamd/autogeree.net.nix
+++ b/servers/mermet/rspamd/autogeree.net.nix
@@ -20,7 +20,7 @@ services.knot.zones."${domain}".data = ''
 '';
 security.pass.secrets."rspamd/dkim/${domain}/${selector}.key" = {
   user = rspamd.user;
-  postStart = "systemctl try-restart rspamd";
+  postStart = "systemctl try-restart --no-block rspamd";
 };
 systemd.services.rspamd = {
   wants = [ pass.secrets."rspamd/dkim/${domain}/${selector}.key".service ];

diff --git a/servers/mermet/rspamd/sourcephile.fr.nix b/servers/mermet/rspamd/sourcephile.fr.nix
index b43df6d85609101c419bc2a57deb0c3c12335375..56283c2430209b3cecc77d8e3fddead92febcd48 100644 (file)
--- a/servers/mermet/rspamd/sourcephile.fr.nix
+++ b/servers/mermet/rspamd/sourcephile.fr.nix
@@ -24,7 +24,7 @@ services.knot.zones."${domain}".data = ''
 '';
 security.pass.secrets."rspamd/dkim/${domain}/${selector}.key" = {
   user = rspamd.user;
-  postStart = "systemctl try-restart rspamd";
+  postStart = "systemctl try-restart --no-block rspamd";
 };
 systemd.services.rspamd = {
   after = [ pass.secrets."rspamd/dkim/${domain}/${selector}.key".service ];