blade-paris: not on ZFS

This commit is contained in:
Luke Granger-Brown 2023-07-11 11:40:55 +01:00
parent b8f338d6fa
commit 52fd493096
2 changed files with 15 additions and 6 deletions

View file

@ -20,6 +20,7 @@ in {
}; };
my.ip.tailscale = "100.117.185.118"; my.ip.tailscale = "100.117.185.118";
my.ip.tailscale6 = "fd7a:115c:a1e0:ab12:4843:cd96:6275:b976"; my.ip.tailscale6 = "fd7a:115c:a1e0:ab12:4843:cd96:6275:b976";
my.blade.onZFS = false;
my.blade.bay = 2; my.blade.bay = 2;
my.blade.macAddress = { my.blade.macAddress = {
internal = "e4:11:5b:ac:e4:8a"; internal = "e4:11:5b:ac:e4:8a";

View file

@ -30,6 +30,8 @@ in {
type = lib.types.nullOr lib.types.str; type = lib.types.nullOr lib.types.str;
default = null; default = null;
}; };
onZFS = lib.mkOption { type = lib.types.bool; default = true; };
}; };
config = { config = {
@ -62,18 +64,24 @@ in {
options = [ "defaults" "size=${size}" "mode=755" ]; options = [ "defaults" "size=${size}" "mode=755" ];
}; };
in { in {
"/" = zfs "tank/local/root";
"/tmp" = zfs "tank/local/tmp";
"/nix" = zfs "tank/local/nix";
"/var" = zfs "tank/safe/var";
"/home" = zfs "tank/safe/home";
"/boot" = { "/boot" = {
device = "/dev/disk/by-label/boot"; device = "/dev/disk/by-label/boot";
fsType = "ext4"; fsType = "ext4";
}; };
"/var/log" = tmpfs "2G"; "/var/log" = tmpfs "2G";
"/var/cache" = tmpfs "16G"; "/var/cache" = tmpfs "16G";
} // (lib.optionalAttrs (config.services.ceph.osd.enable || config.services.ceph.mgr.enable || config.services.ceph.mon.enable || config.services.ceph.mgr.enable) { } // (lib.optionalAttrs (config.my.blade.onZFS) {
"/" = zfs "tank/local/root";
"/tmp" = zfs "tank/local/tmp";
"/nix" = zfs "tank/local/nix";
"/var" = zfs "tank/safe/var";
"/home" = zfs "tank/safe/home";
}) // (lib.optionalAttrs (!config.my.blade.onZFS) {
"/" = {
device = "/dev/disk/by-label/root";
fsType = "ext4";
};
}) // (lib.optionalAttrs (config.services.ceph.osd.enable || config.services.ceph.mgr.enable || config.services.ceph.mon.enable || config.services.ceph.mgr.enable) {
"/var/lib/ceph" = { "/var/lib/ceph" = {
device = "/dev/disk/by-label/var-lib-ceph"; device = "/dev/disk/by-label/var-lib-ceph";
fsType = "xfs"; fsType = "xfs";