From d4aad12c32aca250aec93f158b11c17cfa2af440 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 25 Jan 2025 03:10:56 +0100 Subject: [PATCH] nfs --- hosts/nixos/nord/configuration.nix | 2 +- hosts/nixos/sopp/configuration.nix | 2 +- profiles/mounts/common-zfs.nix | 14 +++++++++----- profiles/mounts/freon-nfs.nix | 2 ++ profiles/mounts/meconium-nfs.nix | 11 +++++++---- profiles/mounts/reidun-nfs.nix | 2 ++ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index ba63096..6c58802 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -26,7 +26,7 @@ ../../../profiles/mounts/freon-nfs.nix ../../../profiles/mounts/reidun-nfs.nix - /* ../../../profiles/mounts/meconium-nfs.nix */ + ../../../profiles/mounts/meconium-nfs.nix /* ../../../profiles/mounts/fridge-nfs.nix */ ../../../profiles/shell.nix diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index 534e210..dfcaef9 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -49,7 +49,7 @@ ../../../profiles/mounts/freon-nfs.nix ../../../profiles/mounts/reidun-nfs.nix - /* ../../../profiles/mounts/meconium-nfs.nix */ + ../../../profiles/mounts/meconium-nfs.nix ../../../profiles/shell.nix diff --git a/profiles/mounts/common-zfs.nix b/profiles/mounts/common-zfs.nix index 93964b3..392013a 100644 --- a/profiles/mounts/common-zfs.nix +++ b/profiles/mounts/common-zfs.nix @@ -32,12 +32,16 @@ #services.zfs.trim.enable = true; # the `sharenfs` property generates /etc/exports.d/zfs.exports file, automatically processed by NFS + + # https://man.freebsd.org/cgi/man.cgi?query=exports - -network only supports a single range + # # sudo zfs set sharenfs="-maproot=0:0 -network=192.168.1.0/24" Reidun/shared + # # sudo zfs set sharenfs="-maproot=0:0 -network=192.168.1.0/24" Freon # https://man.archlinux.org/man/core/nfs-utils/exports.5.en - # # zfs set sharenfs="-maproot=0:0 -network=192.168.1.0/24" Reidun/shared - # # zfs set sharenfs="-maproot=0:0 -network=192.168.1.0/24" Freon/Music - # # zfs set sharenfs="ro=192.168.1.0/24,all_squash,anonuid=70,anongid=70" Meconium - # # zfs set sharenfs="rw=@192.168.1.0/24" Meconium - # # zfs set sharenfs="rw=@100.64.0.0/10" Meconium + # # sudo zfs set sharenfs="rw=100.64.0.0/10,rw=192.168.1.0/24" Meconium + + # # sudo zfs set sharenfs="-maproot=0:0 -network=100.64.0.0/10" Reidun/shared + # # sudo zfs set sharenfs="-maproot=0:0 -network=100.64.0.0/10" Freon + # # sudo zfs set sharenfs="rw=100.64.0.0/10" Meconium services.nfs.server.enable = lib.mkDefault true; # https://wiki.nixos.org/wiki/NFS diff --git a/profiles/mounts/freon-nfs.nix b/profiles/mounts/freon-nfs.nix index c67a045..fd3c368 100644 --- a/profiles/mounts/freon-nfs.nix +++ b/profiles/mounts/freon-nfs.nix @@ -21,6 +21,8 @@ lib.mkIf (!config.virtualisation.isVmVariant) joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; # TODO: space in dirname is not supported in joinSets (map (mkMount "/mnt/freon" "192.168.1.3:/Freon") [ + /* in joinSets (map (mkMount "/mnt/freon" "knut.tail9aac63.ts.net:/Freon") [ */ + /* in joinSets (map (mkMount "/mnt/freon" "100.109.53.107:/Freon") [ */ "" "/Backups" "/ISO" diff --git a/profiles/mounts/meconium-nfs.nix b/profiles/mounts/meconium-nfs.nix index ef79865..62e21de 100644 --- a/profiles/mounts/meconium-nfs.nix +++ b/profiles/mounts/meconium-nfs.nix @@ -19,11 +19,14 @@ # TODO: combine nameValuePair and listToAttrs joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; # TODO: space in dirname is not supported - in joinSets (map (mkMount "/mnt/meconium" "192.168.1.8:/Meconium" ) [ + in joinSets (map (mkMount "/mnt/meconium" "192.168.1.9:/mnt/meconium" ) [ + /* in joinSets (map (mkMount "/mnt/meconium" "noximilien.tail9aac63.ts.net:/mnt/meconium" ) [ */ + /* in joinSets (map (mkMount "/mnt/meconium" "100.113.27.44:/mnt/meconium" ) [ */ "" - "/backups" - "/backups/rocm" - "/beets_music" + "/Backups" + "/Backups/rocm.pbsds.net" + "/blob" + "/blob/attic" #"/garage" #"/garage/gunktrunk" ]); diff --git a/profiles/mounts/reidun-nfs.nix b/profiles/mounts/reidun-nfs.nix index f26bbec..9cbeaa8 100644 --- a/profiles/mounts/reidun-nfs.nix +++ b/profiles/mounts/reidun-nfs.nix @@ -21,6 +21,8 @@ lib.mkIf (!config.virtualisation.isVmVariant) joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; # TODO: space in dirname is not supported in joinSets (map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [ + /* in joinSets (map (mkMount "/mnt/reidun" "knut.tail9aac63.ts.net:/Reidun/shared") [ */ + /* in joinSets (map (mkMount "/mnt/reidun" "100.109.53.107:/Reidun/shared") [ */ "" #"/Comics" "/Downloads"