From 25b475522710db5c9ec5ef64b3a27d72aad13774 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Thu, 5 Oct 2023 22:04:10 +0200 Subject: [PATCH] voyager/sarek: Fix NFS export --- hosts/sarek/configuration.nix | 6 ------ hosts/voyager/exports.nix | 10 ++++++++-- hosts/voyager/filesystems.nix | 17 ----------------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/hosts/sarek/configuration.nix b/hosts/sarek/configuration.nix index 4e08a4d..39bbd91 100644 --- a/hosts/sarek/configuration.nix +++ b/hosts/sarek/configuration.nix @@ -9,12 +9,6 @@ # ./hardware-configuration.nix ]; - fileSystems."/mnt/backup" = { - fsType = "nfs"; - device = "//voyager.home.feal.no/defiant-backup"; - options = [ "defaults" "noauto" "x-systemd.automount" ]; - }; - # Boot and console is handled by proxmoxLXC. boot.loader.systemd-boot.enable = lib.mkForce false; # Enabled in base.nix, forced off here. diff --git a/hosts/voyager/exports.nix b/hosts/voyager/exports.nix index 47fda69..ab12584 100644 --- a/hosts/voyager/exports.nix +++ b/hosts/voyager/exports.nix @@ -5,17 +5,23 @@ device = "/tank/backup/riker"; options = [ "bind" ]; }; + "/export/defiant-backup" = { + device = "/tank/backup/defiant"; + options = [ "bind" ]; + }; }; # Enable nfs4 only services.nfs.server = { enable = true; exports = '' - /export 192.168.10.4(rw,fsid=0,no_subtree_check) 192.168.10.5(rw,fsid=0,no_subtree_check) 192.168.10.2(rw,fsid=0,no_subtree_check) + /export 192.168.10.4(rw,fsid=0,no_subtree_check) 192.168.10.5(rw,fsid=0,no_subtree_check) 192.168.10.2(rw,fsid=0,no_subtree_check) 192.168.10.175(rw,fsid=0,no_subtree_check) /export/riker-backup 192.168.10.2(rw,nohide,no_subtree_check,no_root_squash) /export/doyle-backup 192.168.10.2(rw,nohide,no_subtree_check,no_root_squash) + /export/defiant-backup 192.168.10.175(rw,nohide,no_subtree_check,async,no_root_squash) ''; }; - networking.firewall.allowedTCPPorts = [ 2049 ]; + networking.firewall.allowedTCPPorts = [ 111 2049 20048 ]; + networking.firewall.allowedUDPPorts = [ 111 20048]; } diff --git a/hosts/voyager/filesystems.nix b/hosts/voyager/filesystems.nix index 5087aac..969ab29 100644 --- a/hosts/voyager/filesystems.nix +++ b/hosts/voyager/filesystems.nix @@ -37,21 +37,4 @@ }; }; - # Network mounts (export) - - fileSystems = { - "/export/defiant-backup" = { - device = "/tank/backup/defiant"; - options = [ "bind" ]; - }; - }; - - services.nfs = { - enable = true; - exports = '' - /export 192.168.10.181(rw,fsid=0,insecure,no_subtree_check,async,no_root_squash) - /export/defiant-backup 192.168.10.181(rw,nohide,insecure,no_subtree_check,async,no_root_squash) - ''; - }; - }