elendel: Tweak datasets and backups

machines/elendel/default.nix

@@ -48,6 +48,18 @@
             fast = true;
             location = "marabethia.vanpetegem.me";
           }
+          {
+            path = "zroot/safe/services/accentor";
+            remotePath = "zroot/recv/elendel/safe/services/accentor";
+            fast = true;
+            location = "marabethia.vanpetegem.me";
+          }
+          {
+            path = "zroot/safe/services/postgresql";
+            remotePath = "zroot/recv/elendel/safe/services/postgresql";
+            fast = true;
+            location = "marabethia.vanpetegem.me";
+          }
           {
             path = "zroot/safe/services/transmission";
             remotePath = "zroot/recv/elendel/safe/services/transmission";
@@ -73,5 +85,4 @@
       torrents.enable = true;
     };
   };
-  services.postgresql.dataDir = lib.mkForce "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
 }

machines/elendel/hardware.nix

@@ -60,7 +60,7 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
     "/var/lib/accentor" = {
-      device = "zroot/local/services/accentor";
+      device = "zroot/safe/services/accentor";
       fsType = "zfs";
     };
     "/var/lib/accentor/transcodes" = {
@@ -71,6 +71,10 @@
       device = "zroot/local/services/docker";
       fsType = "zfs";
     };
+    "/var/lib/postgresql" = {
+      device = "zroot/safe/services/postgresql";
+      fsType = "zfs";
+    };
     "/var/lib/transmission" = {
       device = "zroot/safe/services/transmission";
       fsType = "zfs";

machines/marabethia/default.nix

@@ -152,5 +152,4 @@
     };
   };
   programs.msmtp.enable = false;
-  services.postgresql.dataDir = lib.mkForce "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
 }

modules/nixos/services/default.nix

@@ -15,6 +15,6 @@
 
   services.postgresql = {
     package = pkgs.postgresql_15;
-    dataDir = "${config.chvp.dataPrefix}/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
+    dataDir = "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
   };
 }