oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: partially fix a totally botched merge.

Browse Source
This commit is contained in:
Jonas Juselius
2025-09-12 14:32:42 +02:00
parent c8814ec8d9
commit fcd136ed4e
21 changed files with 2 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rossby/mounts.nix
View File

@@ -9,13 +9,8 @@ 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"
@@ -77,11 +72,7 @@ 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