From c86b339491d0c42540650d86e4ba840cdb686b50 Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@google.com>
Date: Tue, 5 Jan 2021 14:53:14 +0100
Subject: [PATCH] nixos/spamassassin: Only run sa-compile when updates have
 been installed

---
 nixos/modules/services/mail/spamassassin.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index 036f1bfebd37..9bd415ef17ea 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -135,13 +135,21 @@ in
         User = "spamd";
         Group = "spamd";
         StateDirectory = "spamassassin";
-        ExecStart = [
-          "${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/"
-          "${pkgs.spamassassin}/bin/sa-compile"
-        ];
         ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service";
         SuccessExitStatus = "1";
       };
+
+      script = ''
+        set +e
+        ${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/
+        rc=$?
+        set -e
+
+        if [[ $rc -eq 0 ]]; then
+          # An update was available and installed.
+          ${pkgs.spamassassin}/bin/sa-compile
+        fi
+      '';
     };
 
     systemd.timers.sa-update = {