major: grand unified clusterfck (ekman not tested yet)
This commit is contained in:
@@ -9,8 +9,13 @@ let
|
||||
|
||||
users =
|
||||
if cfg.users then {
|
||||
<<<<<<<< HEAD:rossby/mounts.nix
|
||||
"/users" = {
|
||||
device = "172.16.239.222:/home";
|
||||
========
|
||||
"/frontend" = {
|
||||
device = "10.255.241.100:/home";
|
||||
>>>>>>>> ekman:ekman/mounts.nix
|
||||
fsType = "nfs4";
|
||||
options = [
|
||||
"soft"
|
||||
@@ -72,7 +77,11 @@ let
|
||||
};
|
||||
} else {};
|
||||
|
||||
<<<<<<<< HEAD:rossby/mounts.nix
|
||||
fileSystems = users // opt // data // work // ceph;
|
||||
========
|
||||
fileSystems = users // opt // data // work // backup // ceph;
|
||||
>>>>>>>> ekman:ekman/mounts.nix
|
||||
|
||||
automount = mountpoint:
|
||||
if cfg.automount.enable && builtins.hasAttr mountpoint fileSystems then
|
||||
|
||||
Reference in New Issue
Block a user