From 5c7a2a294d8f0ec70b063f03241c1e91df22d343 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 28 Dec 2021 22:37:16 +0100
Subject: vidhar: samba: eos: ...

---
 hosts/vidhar/default.nix | 13 +++++++++----
 hosts/vidhar/zfs.nix     |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'hosts')

diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index a7fb99ea..7591db37 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -380,11 +380,16 @@
     };
 
     fileSystems."/srv/eos.lower" = {
-      device = "UUID=2A3052E73052BA11";
+      device = "/dev/zvol/hdd-raid6/safe/home/mherold/eos/base";
       fsType = "ntfs3";
       options = [ "ro" "uid=mherold" "gid=users" "fmask=0177" "dmask=0077" ];
     };
 
+    fileSystems."/srv/eos.upper" = {
+      device = "/dev/zvol/hdd-raid6/safe/home/mherold/eos/upper";
+      fsType = "ext4";
+    };
+
     systemd.mounts = [
       {
         wantedBy = [ "samba-smbd.service" ];
@@ -395,12 +400,12 @@
         type = "overlay";
         options = lib.concatStringsSep ","
           [ "lowerdir=/srv/eos.lower"
-            "upperdir=/home/mherold/.eos.upper"
-            "workdir=/home/mherold/.eos.work"
+            "upperdir=/srv/eos.upper/upper"
+            "workdir=/srv/eos.upper/work"
           ];
 
         unitConfig = {
-          RequiresMountsFor = [ "/srv/eos.lower" "/home/mherold/.eos.upper" "/home/mherold/.eos.work" ];
+          RequiresMountsFor = [ "/srv/eos.lower" "/srv/eos.upper" ];
         };
       }
     ];
diff --git a/hosts/vidhar/zfs.nix b/hosts/vidhar/zfs.nix
index d2278615..0cd53a34 100644
--- a/hosts/vidhar/zfs.nix
+++ b/hosts/vidhar/zfs.nix
@@ -110,6 +110,7 @@ in {
 
               preStart = ''
                 ${zfs}/bin/zfs set com.sun:auto-snapshot=true hdd-raid6/safe
+                ${zfs}/bin/zfs set com.sun:auto-snapshot=false hdd-raid6/safe/home/mherold/eos/base
                 ${zfs}/bin/zfs set com.sun:auto-snapshot=true ssd-raid1/safe
                 ${zfs}/bin/zfs set com.sun:auto-snapshot=true boot
               '';
-- 
cgit v1.2.3