unitstatus: pre-defined service units now exist

modules/base/unitstatus/default.nix

@@ -5,60 +5,50 @@
   ...
 }: {
   # TODO:
-  # - accept unit names:
-  #   - assert they exist
-  #   - add 'systemd.<unit>.unitConfig.OnFailure' to point to this one.
   # - assert postfix is configured
   options.mj.base.unitstatus = with lib.types; {
     enable = lib.mkEnableOption "alert by email on unit failure";
     email = lib.mkOption {type = str;};
-    #units = lib.mkOption {type = lisOf str;};
+    units = lib.mkOption {type = listOf str;};
   };
 
-  config =
-    lib.mkIf config.mj.base.unitstatus.enable {
-      systemd.services."unit-status-mail@" = let
-        # https://northernlightlabs.se/2014-07-05/systemd-status-mail-on-unit-failure.html
-        script = pkgs.writeShellScript "unit-status-mail" ''
-          set -e
-          MAILTO="${config.mj.base.unitstatus.email}"
-          UNIT=$1
-          EXTRA=""
-          for e in "''${@:2}"; do
-            EXTRA+="$e"$'\n'
-          done
-          UNITSTATUS=$(${pkgs.systemd}/bin/systemctl status "$UNIT")
-          ${pkgs.postfix}/bin/sendmail $MAILTO <<EOF
-          Subject:Status mail for unit: $UNIT
+  config = lib.mkIf config.mj.base.unitstatus.enable {
+    systemd.services =
+      {
+        "unit-status-mail@" = let
+          # https://northernlightlabs.se/2014-07-05/systemd-status-mail-on-unit-failure.html
+          script = pkgs.writeShellScript "unit-status-mail" ''
+            set -e
+            MAILTO="${config.mj.base.unitstatus.email}"
+            UNIT=$1
+            EXTRA=""
+            for e in "''${@:2}"; do
+              EXTRA+="$e"$'\n'
+            done
+            UNITSTATUS=$(${pkgs.systemd}/bin/systemctl status "$UNIT")
+            ${pkgs.postfix}/bin/sendmail $MAILTO <<EOF
+            Subject:Status mail for unit: $UNIT
 
-          Status report for unit: $UNIT
-          $EXTRA
+            Status report for unit: $UNIT
+            $EXTRA
 
-          $UNITSTATUS
-          EOF
+            $UNITSTATUS
+            EOF
 
-          echo -e "Status mail sent to: $MAILTO for unit: $UNIT"
-        '';
-      in {
-        description = "Send an email on unit failure";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = ''${script} "%I" "Hostname: %H" "Machine ID: %m" "Boot ID: %b" '';
+            echo -e "Status mail sent to: $MAILTO for unit: $UNIT"
+          '';
+        in {
+          description = "Send an email on unit failure";
+          serviceConfig = {
+            Type = "simple";
+            ExecStart = ''${script} "%I" "Hostname: %H" "Machine ID: %m" "Boot ID: %b" '';
+          };
         };
-      };
-    #};
-    # See TODO above.
-    #// {
-    #  systemd.services =
-    #    lib.listToAttrs
-    #    (map (
-    #        unit: {
-    #          name = unit;
-    #          value = {
-    #            unitConfig = {OnFailure = "unit-status-mail@${unit}.service";};
-    #          };
-    #        }
-    #      )
-    #      config.mj.base.unitstatus.units);
-    };
+      }
+      // lib.genAttrs config.mj.base.unitstatus.units (
+        unit: {
+          unitConfig = {OnFailure = "unit-status-mail@${unit}.service";};
+        }
+      );
+  };
 }

modules/base/zfsborg/default.nix

@@ -57,34 +57,44 @@ in {
     services.borgbackup.jobs = lib.mapAttrs' (mountpoint: attrs: let
       fs = builtins.getAttr mountpoint config.fileSystems;
     in
-      assert fs.fsType == "zfs"; {
-        name = lib.strings.sanitizeDerivationName mountpoint;
-        value =
-          {
-            doInit = true;
-            repo = config.mj.base.zfsborg.repo;
-            encryption = {
-              mode = "repokey-blake2";
-              passCommand = "cat ${config.mj.base.zfsborg.passwdPath}";
+      assert fs.fsType == "zfs";
+      assert lib.assertMsg
+          config.mj.base.unitstatus.enable
+          "config.mj.base.unitstatus.enable must be true";
+        {
+          name = lib.strings.sanitizeDerivationName mountpoint;
+          value =
+            {
+              doInit = true;
+              repo = config.mj.base.zfsborg.repo;
+              encryption = {
+                mode = "repokey-blake2";
+                passCommand = "cat ${config.mj.base.zfsborg.passwdPath}";
+              };
+              paths = attrs.paths;
+              extraArgs = "--remote-path=borg1";
+              compression = "auto,lzma";
+              startAt = attrs.backup_at;
+              readWritePaths = let p = mountpoint + "/.snapshot-latest"; in [p];
+              preHook = mountLatest mountpoint fs.device;
+              postHook = umountLatest mountpoint;
+              prune.keep = {
+                within = "1d";
+                daily = 7;
+                weekly = 4;
+                monthly = 3;
+              };
+            }
+            // lib.optionalAttrs (attrs ? patterns) {
+              patterns = attrs.patterns;
             };
-            paths = attrs.paths;
-            extraArgs = "--remote-path=borg1";
-            compression = "auto,lzma";
-            startAt = attrs.backup_at;
-            readWritePaths = let p = mountpoint + "/.snapshot-latest"; in [p];
-            preHook = mountLatest mountpoint fs.device;
-            postHook = umountLatest mountpoint;
-            prune.keep = {
-              within = "1d";
-              daily = 7;
-              weekly = 4;
-              monthly = 3;
-            };
-          }
-          // lib.optionalAttrs (attrs ? patterns) {
-            patterns = attrs.patterns;
-          };
-      })
+        })
     config.mj.base.zfsborg.mountpoints;
+
+    mj.base.unitstatus.units = let
+      mounts = config.mj.base.zfsborg.mountpoints;
+      sanitized = map lib.strings.sanitizeDerivationName (lib.attrNames mounts);
+    in
+      map (n: "borgbackup-job-${n}") sanitized;
   };
 }