public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating the nixos NFS related expressions. Thanks to Oleksandr for the

Browse Source 
help.
I tried not to break the tests.


svn path=/nixos/trunk/; revision=20157
This commit is contained in:
Lluís Batlle i Rossell 2010-02-21 16:26:33 +00:00
parent 2b7da40351
commit 0fb8300bb6
3 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
modules/services/network-filesystems/nfs-kernel.nix
View File

@ -8,11 +8,6 @@ let
cfg = config.services.nfsKernel; cfg = config.services.nfsKernel;
exports =
if builtins.pathExists cfg.exports
then cfg.exports
else pkgs.writeText "exports" cfg.exports;
in in
{ {
@ -23,43 +18,51 @@ in
services.nfsKernel = { services.nfsKernel = {
enable = mkOption { client.enable = mkOption {
default = false; default = false;
description = '' description = ''
Whether to enable the kernel's NFS server. Whether to enable the kernel's NFS client daemons.
''; '';
}; };
# !!! Why is this a file? Why not a list of export entries? server = {
exports = mkOption { enable = mkOption {
check = v: v != "/etc/exports"; # this won't work default = false;
description = '' description = ''
The file listing the directories to be exported. See Whether to enable the kernel's NFS server.
<citerefentry><refentrytitle>exports</refentrytitle> '';
<manvolnum>5</manvolnum></citerefentry> for the format. };
'';
};
hostName = mkOption { exports = mkOption {
default = null; default = "";
description = '' description = ''
Hostname or address on which NFS requests will be accepted. Contents of the /etc/exports file. See
Default is all. See the <option>-H</option> option in <citerefentry><refentrytitle>exports</refentrytitle>
<citerefentry><refentrytitle>nfsd</refentrytitle> <manvolnum>5</manvolnum></citerefentry> for the format.
<manvolnum>8</manvolnum></citerefentry>. '';
''; };
};
hostName = mkOption {
default = null;
description = ''
Hostname or address on which NFS requests will be accepted.
Default is all. See the <option>-H</option> option in
<citerefentry><refentrytitle>nfsd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>.
'';
};
nproc = mkOption { nproc = mkOption {
default = 8; default = 8;
description = '' description = ''
Number of NFS server threads. Defaults to the recommended value of 8. Number of NFS server threads. Defaults to the recommended value of 8.
''; '';
}; };
createMountPoints = mkOption { createMountPoints = mkOption {
default = false; default = false;
description = "Whether to create the mount points in the exports file at startup time."; description = "Whether to create the mount points in the exports file at startup time.";
};
}; };
}; };
@ -69,19 +72,19 @@ in
###### implementation ###### implementation
config = mkIf config.services.nfsKernel.enable { config = {
assertions = singleton assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton
{ assertion = config.services.portmap.enable; { assertion = config.services.portmap.enable;
message = "Please enable portmap (services.portmap.enable) to use nfs-kernel."; message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
}; });
environment.etc = singleton environment.etc = mkIf cfg.server.enable (singleton
{ source = exports; { source = cfg.server.exports;
target = "exports"; target = "exports";
}; });
jobs.nfs_kernel_exports = jobs.nfs_kernel_exports = mkIf cfg.server.enable
{ name = "nfs-kernel-exports"; { name = "nfs-kernel-exports";
description = "Kernel NFS server"; description = "Kernel NFS server";
@ -95,23 +98,23 @@ in
mkdir -p /var/lib/nfs mkdir -p /var/lib/nfs
${config.system.sbin.modprobe}/sbin/modprobe nfsd || true ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
${optionalString cfg.createMountPoints ${optionalString cfg.server.createMountPoints
'' ''
# create export directories: # create export directories:
# skip comments, take first col which may either be a quoted # skip comments, take first col which may either be a quoted
# "foo bar" or just foo (-> man export) # "foo bar" or just foo (-> man export)
sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \ sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
| xargs -d '\n' mkdir -p | xargs -d '\n' mkdir -p
'' ''
} }
# exports file is ${exports} # exports file is ${cfg.server.exports}
# keep this comment so that this job is restarted whenever exports changes! # keep this comment so that this job is restarted whenever exports changes!
exportfs -ra exportfs -ra
''; '';
}; };
jobs.nfs_kernel_nfsd = jobs.nfs_kernel_nfsd = mkIf cfg.server.enable
{ name = "nfs-kernel-nfsd"; { name = "nfs-kernel-nfsd";
description = "Kernel NFS server"; description = "Kernel NFS server";
@ -119,10 +122,10 @@ in
startOn = "started nfs-kernel-exports and started portmap"; startOn = "started nfs-kernel-exports and started portmap";
stopOn = "stopping nfs-kernel-exports"; stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}"; exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
}; };
jobs.nfs_kernel_mountd = jobs.nfs_kernel_mountd = mkIf cfg.server.enable
{ name = "nfs-kernel-mountd"; { name = "nfs-kernel-mountd";
description = "Kernel NFS server - mount daemon"; description = "Kernel NFS server - mount daemon";
@ -130,10 +133,10 @@ in
startOn = "started nfs-kernel-nfsd and started portmap"; startOn = "started nfs-kernel-nfsd and started portmap";
stopOn = "stopping nfs-kernel-exports"; stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}"; exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
}; };
jobs.nfs_kernel_statd = jobs.nfs_kernel_statd = mkIf (cfg.client.enable || cfg.server.enable)
{ name = "nfs-kernel-statd"; { name = "nfs-kernel-statd";
description = "Kernel NFS server - Network Status Monitor"; description = "Kernel NFS server - Network Status Monitor";

8
tests/check-filesystems.nix
View File

@ -10,12 +10,13 @@ rec {
nodes = { nodes = {
share = {pkgs, config, ...}: { share = {pkgs, config, ...}: {
services.portmap.enable = true; services.portmap.enable = true;
services.nfsKernel.enable = true; services.nfsKernel.client.enable = true;
services.nfsKernel.exports = '' services.nfsKernel.server.enable = true;
services.nfsKernel.server.exports = ''
/repos1 192.168.1.0/255.255.255.0(rw,no_root_squash) /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
/repos2 192.168.1.0/255.255.255.0(rw,no_root_squash) /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
''; '';
services.nfsKernel.createMountPoints = true; services.nfsKernel.server.createMountPoints = true;
jobs.checkable = { jobs.checkable = {
startOn = [ startOn = [
@ -29,6 +30,7 @@ rec {
fsCheck = {pkgs, config, ...}: { fsCheck = {pkgs, config, ...}: {
# enable nfs import # enable nfs import
services.portmap.enable = true; services.portmap.enable = true;
services.nfsKernel.client.enable = true;
fileSystems = fileSystems =
let let

7
tests/trac.nix
View File

@ -6,11 +6,11 @@
{pkgs, config, ...}: {pkgs, config, ...}:
{ {
services.portmap.enable = true; services.portmap.enable = true;
services.nfsKernel.enable = true; services.nfsKernel.server.enable = true;
services.nfsKernel.exports = '' services.nfsKernel.server.exports = ''
/repos 192.168.1.0/255.255.255.0(rw,no_root_squash) /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
''; '';
services.nfsKernel.createMountPoints = true; services.nfsKernel.server.createMountPoints = true;
}; };
postgresql = postgresql =
@ -37,6 +37,7 @@
]; ];
services.portmap.enable = true; services.portmap.enable = true;
services.nfsKernel.client.enable = true;
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "root@localhost"; services.httpd.adminAddr = "root@localhost";
services.httpd.extraSubservices = [ { serviceType = "trac"; } ]; services.httpd.extraSubservices = [ { serviceType = "trac"; } ];