summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-28 22:37:16 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-28 22:37:16 +0100
commit5c7a2a294d8f0ec70b063f03241c1e91df22d343 (patch)
tree7004ae8371f472c00f77804fe2ce16eb0ecebb63
parent24ff2fb458b0af164a44f7b48b32919c16728cc7 (diff)
downloadnixos-5c7a2a294d8f0ec70b063f03241c1e91df22d343.tar
nixos-5c7a2a294d8f0ec70b063f03241c1e91df22d343.tar.gz
nixos-5c7a2a294d8f0ec70b063f03241c1e91df22d343.tar.bz2
nixos-5c7a2a294d8f0ec70b063f03241c1e91df22d343.tar.xz
nixos-5c7a2a294d8f0ec70b063f03241c1e91df22d343.zip
vidhar: samba: eos: ...
-rw-r--r--hosts/vidhar/default.nix13
-rw-r--r--hosts/vidhar/zfs.nix1
2 files changed, 10 insertions, 4 deletions
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 @@
380 }; 380 };
381 381
382 fileSystems."/srv/eos.lower" = { 382 fileSystems."/srv/eos.lower" = {
383 device = "UUID=2A3052E73052BA11"; 383 device = "/dev/zvol/hdd-raid6/safe/home/mherold/eos/base";
384 fsType = "ntfs3"; 384 fsType = "ntfs3";
385 options = [ "ro" "uid=mherold" "gid=users" "fmask=0177" "dmask=0077" ]; 385 options = [ "ro" "uid=mherold" "gid=users" "fmask=0177" "dmask=0077" ];
386 }; 386 };
387 387
388 fileSystems."/srv/eos.upper" = {
389 device = "/dev/zvol/hdd-raid6/safe/home/mherold/eos/upper";
390 fsType = "ext4";
391 };
392
388 systemd.mounts = [ 393 systemd.mounts = [
389 { 394 {
390 wantedBy = [ "samba-smbd.service" ]; 395 wantedBy = [ "samba-smbd.service" ];
@@ -395,12 +400,12 @@
395 type = "overlay"; 400 type = "overlay";
396 options = lib.concatStringsSep "," 401 options = lib.concatStringsSep ","
397 [ "lowerdir=/srv/eos.lower" 402 [ "lowerdir=/srv/eos.lower"
398 "upperdir=/home/mherold/.eos.upper" 403 "upperdir=/srv/eos.upper/upper"
399 "workdir=/home/mherold/.eos.work" 404 "workdir=/srv/eos.upper/work"
400 ]; 405 ];
401 406
402 unitConfig = { 407 unitConfig = {
403 RequiresMountsFor = [ "/srv/eos.lower" "/home/mherold/.eos.upper" "/home/mherold/.eos.work" ]; 408 RequiresMountsFor = [ "/srv/eos.lower" "/srv/eos.upper" ];
404 }; 409 };
405 } 410 }
406 ]; 411 ];
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 {
110 110
111 preStart = '' 111 preStart = ''
112 ${zfs}/bin/zfs set com.sun:auto-snapshot=true hdd-raid6/safe 112 ${zfs}/bin/zfs set com.sun:auto-snapshot=true hdd-raid6/safe
113 ${zfs}/bin/zfs set com.sun:auto-snapshot=false hdd-raid6/safe/home/mherold/eos/base
113 ${zfs}/bin/zfs set com.sun:auto-snapshot=true ssd-raid1/safe 114 ${zfs}/bin/zfs set com.sun:auto-snapshot=true ssd-raid1/safe
114 ${zfs}/bin/zfs set com.sun:auto-snapshot=true boot 115 ${zfs}/bin/zfs set com.sun:auto-snapshot=true boot
115 ''; 116 '';