3 files changed, 71 insertions, 30 deletions

diff --git a/bragi.nix b/bragi.nix
index c186cb27..2278ffdc 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -10,6 +10,7 @@ in rec {
       ./bragi/hw.nix
       ./custom/zsh.nix
       ./users.nix
+      ./custom/unit-status-mail.nix
     ];
 
   boot.loader.grub.enable = true;
@@ -424,4 +425,8 @@ in rec {
     git -C /etc/nixos pull
     git -C /etc/nixos submodule update
   '';
+
+  systemd.status-mail = {
+    onFailure = [ "nixos-upgrade" ];
+  };
 }
diff --git a/custom/unit-status-mail.nix b/custom/unit-status-mail.nix
new file mode 100644
index 00000000..54e5cb39
--- /dev/null
+++ b/custom/unit-status-mail.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.systemd.status-mail;
+
+  systemdCfg = foldr singleCfg {} cfg.onFailure;
+  singleCfg = unitName: attrs: attrs // (setAttrByPath ["systemd" "services" unitName "onFailure"] ["unit-status-mail@%n.service"]);
+in {
+  options = {
+    systemd.status-mail = {
+      onFailure = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        description = ''
+          Send status mail when these units fail
+        '';
+      };
+
+      recipient = mkOption {
+        default = "root";
+        type = types.str;
+        description = ''
+          Recipient of status mails
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.onFailure != []) {
+    systemd.services."unit-status-mail@" = {
+      serviceConfig = {
+        Type = "oneshot";
+      };
+      scriptArgs = "%I \"Hostname: %H\" \"Machine-ID: %m\" \"Boot-ID: %b\"";
+      script = ''
+        #!${pkgs.stdenv.shell}
+        MAILTO="root"
+        MAILFROM="unit-status-mailer"
+        UNIT=$1
+
+        EXTRA=""
+        for e in "''${@:2}"; do
+          EXTRA+="$e"$'\n'
+        done
+
+        UNITSTATUS=$(systemctl status $UNIT)
+
+        ${config.security.wrapperDir}/sendmail $MAILTO <<EOF
+        From:$MAILFROM
+        To:$MAILTO
+        Subject:Status of $UNIT
+
+        Status report for unit: $UNIT
+        $EXTRA
+
+        $UNITSTATUS
+        EOF
+      '';
+    };
+  } // systemdCfg;
+}
diff --git a/ymir.nix b/ymir.nix
index fd373220..00149d06 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -32,6 +32,7 @@ in rec {
       ./custom/tinc/def.nix
       ./custom/ymir-nginx.nix
       ./custom/uucp.nix
+      ./custom/unit-status-mail.nix
     ];
 
   boot.loader.grub = {
@@ -898,36 +899,8 @@ in rec {
     git -C /etc/nixos pull
     git -C /etc/nixos submodule update
   '';
-  systemd.services."nixos-upgrade".onFailure = ["unit-status-mail@%n.service"];
 
-  systemd.services."unit-status-mail@" = {
-    serviceConfig = {
-      Type = "oneshot";
-    };
-    scriptArgs = "%I \"Hostname: %H\" \"Machine-ID: %m\" \"Boot-ID: %b\"";
-    script = ''
-      #!${pkgs.stdenv.shell}
-      MAILTO="root"
-      MAILFROM="unit-status-mailer"
-      UNIT=$1
-
-      EXTRA=""
-      for e in "''${@:2}"; do
-        EXTRA+="$e"$'\n'
-      done
-
-      UNITSTATUS=$(systemctl status $UNIT)
-
-      ${config.security.wrapperDir}/sendmail $MAILTO <<EOF
-      From:$MAILFROM
-      To:$MAILTO
-      Subject:Status of $UNIT
-
-      Status report for unit: $UNIT
-      $EXTRA
-
-      $UNITSTATUS
-      EOF
-    '';
+  systemd.status-mail = {
+    onFailure = [ "nixos-upgrade" ];
   };
 }