diff options
Diffstat (limited to 'hosts/arrakis')
| -rw-r--r-- | hosts/arrakis/default.nix | 4 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 18 | ||||
| -rw-r--r-- | hosts/arrakis/services.nix | 6 |
3 files changed, 26 insertions, 2 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 7eb9f28..2b3f855 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -6,7 +6,7 @@ "net.ipv4.ip_forward" = 1; #"net.ipv4.conf.all.proxy_arp" = 1; }; - kernelPackages = pkgs.linuxPackages_6_15; + kernelPackages = pkgs.linuxPackages_6_16; loader = { efi = { canTouchEfiVariables = true; @@ -292,6 +292,8 @@ after = [ "zfs-import-data.service" ]; description = "Bind NFS exports to ZFS paths"; script = '' + ${pkgs.util-linux}/bin/mount --onlyonce /srv/caladan/downloads || ${pkgs.coreutils}/bin/true + ${pkgs.util-linux}/bin/mount --onlyonce /srv/caladan/www || ${pkgs.coreutils}/bin/true ${pkgs.util-linux}/bin/mount --onlyonce /srv/nfs/keepers || ${pkgs.coreutils}/bin/true ${pkgs.util-linux}/bin/mount --onlyonce /srv/nfs/movies || ${pkgs.coreutils}/bin/true ${pkgs.util-linux}/bin/mount --onlyonce /srv/nfs/tv || ${pkgs.coreutils}/bin/true diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index c7a6652..1948809 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -21,6 +21,24 @@ MOZ_DISABLE_RDD_SANDBOX = "1"; }; + fileSystems."/srv/caladan/downloads" = { + device = "/data/home/nipsy/downloads"; + fsType = "none"; + options = [ + "bind" + "noauto" + ]; + }; + + fileSystems."/srv/caladan/www" = { + device = "/data/home/nipsy/www"; + fsType = "none"; + options = [ + "bind" + "noauto" + ]; + }; + fileSystems."/srv/nfs/keepers" = { device = "/data/home/nipsy/downloads/keepers"; fsType = "none"; diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix index a42a2b9..05e8836 100644 --- a/hosts/arrakis/services.nix +++ b/hosts/arrakis/services.nix @@ -65,7 +65,11 @@ server = { enable = true; exports = '' - /srv/nfs 192.168.1.0/24(ro,all_squash,insecure,crossmnt,subtree_check,fsid=0) + /srv/caladan/downloads 192.168.1.4/32(rw,root_squash,fsid=1) + /srv/caladan/www 192.168.1.4/32(rw,root_squash,fsid=2) + /srv/nfs/keepers 192.168.1.0/24(ro,all_squash,insecure,fsid=3) + /srv/nfs/movies 192.168.1.0/24(ro,all_squash,insecure,fsid=4) + /srv/nfs/tv 192.168.1.0/24(ro,all_squash,insecure,fsid=5) ''; }; settings = { |