From 9e04ebf0aea77ccbfb695a3d2810c8c2f1853103 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Wed, 4 Dec 2024 15:43:35 +0100
Subject: [PATCH] elendel: Tweak datasets and backups

---
 machines/elendel/default.nix       | 13 ++++++++++++-
 machines/elendel/hardware.nix      |  6 +++++-
 machines/marabethia/default.nix    |  1 -
 modules/nixos/services/default.nix |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/machines/elendel/default.nix b/machines/elendel/default.nix
index d50c1156..bf1f3d69 100644
--- a/machines/elendel/default.nix
+++ b/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}";
 }
diff --git a/machines/elendel/hardware.nix b/machines/elendel/hardware.nix
index b6538a79..9e3169f7 100644
--- a/machines/elendel/hardware.nix
+++ b/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";
diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix
index 27af5b05..64e585b5 100644
--- a/machines/marabethia/default.nix
+++ b/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}";
 }
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index b038b76b..8c23dda0 100644
--- a/modules/nixos/services/default.nix
+++ b/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}";
   };
 }