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

* Don't say `jobs.foo = mkIf condition { ... }' because that will

Browse Source 
create an empty job `foo' if the condition is false.  Instead use
  `jobs = optionalAttrs condition { foo = { ... }; }'.
* Enable portmap automatically when using the NFS server or client.

svn path=/nixos/trunk/; revision=20178
This commit is contained in:
Eelco Dolstra 2010-02-22 17:12:26 +00:00
parent 0fb8300bb6
commit cc0a2a6944
1 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,10 @@ in
config = { config = {
services.portmap.enable = cfg.client.enable || cfg.server.enable;
assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton
{ assertion = config.services.portmap.enable; { assertion = cfg.client.enable || cfg.server.enable;
message = "Please enable portmap (services.portmap.enable) to use nfs-kernel."; message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
}); });
@ -84,73 +86,82 @@ in
target = "exports"; target = "exports";
}); });
jobs.nfs_kernel_exports = mkIf cfg.server.enable jobs =
{ name = "nfs-kernel-exports"; optionalAttrs cfg.server.enable
{ nfs_kernel_exports =
{ name = "nfs-kernel-exports";
description = "Kernel NFS server"; description = "Kernel NFS server";
startOn = "started network-interfaces"; startOn = "started network-interfaces";
stopOn = "stopping network-interfaces"; stopOn = "stopping network-interfaces";
preStart = preStart =
''
export PATH=${pkgs.nfsUtils}/sbin:$PATH
mkdir -p /var/lib/nfs
${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
${optionalString cfg.server.createMountPoints
'' ''
# create export directories: export PATH=${pkgs.nfsUtils}/sbin:$PATH
# skip comments, take first col which may either be a quoted mkdir -p /var/lib/nfs
# "foo bar" or just foo (-> man export) ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
| xargs -d '\n' mkdir -p
''
}
# exports file is ${cfg.server.exports}
# keep this comment so that this job is restarted whenever exports changes!
exportfs -ra
'';
};
jobs.nfs_kernel_nfsd = mkIf cfg.server.enable ${optionalString cfg.server.createMountPoints
{ name = "nfs-kernel-nfsd"; ''
# create export directories:
# skip comments, take first col which may either be a quoted
# "foo bar" or just foo (-> man export)
sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
| xargs -d '\n' mkdir -p
''
}
description = "Kernel NFS server"; # exports file is ${cfg.server.exports}
# keep this comment so that this job is restarted whenever exports changes!
exportfs -ra
'';
};
}
// optionalAttrs cfg.server.enable
{ nfs_kernel_nfsd =
{ name = "nfs-kernel-nfsd";
startOn = "started nfs-kernel-exports and started portmap"; description = "Kernel NFS server";
stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}"; startOn = "started nfs-kernel-exports and started portmap";
}; stopOn = "stopping nfs-kernel-exports";
jobs.nfs_kernel_mountd = mkIf cfg.server.enable exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
{ name = "nfs-kernel-mountd"; };
}
description = "Kernel NFS server - mount daemon"; // optionalAttrs cfg.server.enable
{ nfs_kernel_mountd =
{ name = "nfs-kernel-mountd";
startOn = "started nfs-kernel-nfsd and started portmap"; description = "Kernel NFS server - mount daemon";
stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}"; startOn = "started nfs-kernel-nfsd and started portmap";
}; stopOn = "stopping nfs-kernel-exports";
jobs.nfs_kernel_statd = mkIf (cfg.client.enable || cfg.server.enable) exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
{ name = "nfs-kernel-statd"; };
}
description = "Kernel NFS server - Network Status Monitor";
startOn = "started nfs-kernel-nfsd and started portmap";
stopOn = "stopping nfs-kernel-exports";
preStart = // optionalAttrs (cfg.client.enable || cfg.server.enable)
'' { nfs_kernel_statd =
mkdir -p /var/lib/nfs { name = "nfs-kernel-statd";
'';
exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F"; description = "Kernel NFS server - Network Status Monitor";
};
startOn = "started nfs-kernel-nfsd and started portmap";
stopOn = "stopping nfs-kernel-exports";
preStart =
''
mkdir -p /var/lib/nfs
'';
exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F";
};
};
}; };