diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/arrakis/default.nix | 1 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 9 | ||||
| -rw-r--r-- | hosts/arrakis/services.nix | 11 | ||||
| -rw-r--r-- | hosts/caladan/hardware-configuration.nix | 8 |
4 files changed, 24 insertions, 5 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index a844ac4..045b4a3 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -332,6 +332,7 @@ after = [ "zfs-import-data.service" ]; description = "Bind NFS exports to ZFS paths"; script = '' + ${pkgs.util-linux}/bin/mount --onlyonce /srv/caladan/audio || ${pkgs.coreutils}/bin/true ${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 diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 21bd5a1..59a787f 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -16,6 +16,15 @@ zfs.extraPools = [ "data" ]; }; + fileSystems."/srv/caladan/audio" = { + device = "/data/home/nipsy/audio"; + fsType = "none"; + options = [ + "bind" + "noauto" + ]; + }; + fileSystems."/srv/caladan/downloads" = { device = "/data/home/nipsy/downloads"; fsType = "none"; diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix index e4da995..a9fac8a 100644 --- a/hosts/arrakis/services.nix +++ b/hosts/arrakis/services.nix @@ -77,11 +77,12 @@ server = { enable = true; exports = '' - /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) + /srv/caladan/audio 192.168.1.4/32(rw,root_squash,fsid=1) + /srv/caladan/downloads 192.168.1.4/32(rw,root_squash,fsid=2) + /srv/caladan/www 192.168.1.4/32(rw,root_squash,fsid=3) + /srv/nfs/keepers 192.168.1.0/24(ro,all_squash,insecure,fsid=4) + /srv/nfs/movies 192.168.1.0/24(ro,all_squash,insecure,fsid=5) + /srv/nfs/tv 192.168.1.0/24(ro,all_squash,insecure,fsid=6) ''; }; settings = { diff --git a/hosts/caladan/hardware-configuration.nix b/hosts/caladan/hardware-configuration.nix index 645d43e..9c9b400 100644 --- a/hosts/caladan/hardware-configuration.nix +++ b/hosts/caladan/hardware-configuration.nix @@ -30,6 +30,14 @@ ]; }; + "/mnt/audio" = { + device = "192.168.1.2:/srv/caladan/audio"; + fsType = "nfs"; + options = [ + "nfsvers=4.2" + ]; + }; + "/mnt/downloads" = { device = "192.168.1.2:/srv/caladan/downloads"; fsType = "nfs"; |