mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #298068 from posch/manage-gids
nixos/nfsd: settings for /etc/nfs.conf
This commit is contained in:
commit
c4719710f0
|
@ -113,25 +113,6 @@ in
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
services.nfs.extraConfig = ''
|
|
||||||
[nfsd]
|
|
||||||
threads=${toString cfg.nproc}
|
|
||||||
${optionalString (cfg.hostName != null) "host=${cfg.hostName}"}
|
|
||||||
${cfg.extraNfsdConfig}
|
|
||||||
|
|
||||||
[mountd]
|
|
||||||
${optionalString (cfg.mountdPort != null) "port=${toString cfg.mountdPort}"}
|
|
||||||
|
|
||||||
[statd]
|
|
||||||
${optionalString (cfg.statdPort != null) "port=${toString cfg.statdPort}"}
|
|
||||||
|
|
||||||
[lockd]
|
|
||||||
${optionalString (cfg.lockdPort != null) ''
|
|
||||||
port=${toString cfg.lockdPort}
|
|
||||||
udp-port=${toString cfg.lockdPort}
|
|
||||||
''}
|
|
||||||
'';
|
|
||||||
|
|
||||||
services.rpcbind.enable = true;
|
services.rpcbind.enable = true;
|
||||||
|
|
||||||
boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd
|
boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd
|
||||||
|
|
|
@ -13,7 +13,46 @@ let
|
||||||
format = pkgs.formats.ini {};
|
format = pkgs.formats.ini {};
|
||||||
|
|
||||||
idmapdConfFile = format.generate "idmapd.conf" cfg.idmapd.settings;
|
idmapdConfFile = format.generate "idmapd.conf" cfg.idmapd.settings;
|
||||||
nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
|
|
||||||
|
# merge parameters from services.nfs.server
|
||||||
|
nfsConfSettings =
|
||||||
|
optionalAttrs (cfg.server.nproc != null) {
|
||||||
|
nfsd.threads = cfg.server.nproc;
|
||||||
|
} // optionalAttrs (cfg.server.hostName != null) {
|
||||||
|
nfsd.host= cfg.hostName;
|
||||||
|
} // optionalAttrs (cfg.server.mountdPort != null) {
|
||||||
|
mountd.port = cfg.server.mountdPort;
|
||||||
|
} // optionalAttrs (cfg.server.statdPort != null) {
|
||||||
|
statd.port = cfg.server.statdPort;
|
||||||
|
} // optionalAttrs (cfg.server.lockdPort != null) {
|
||||||
|
lockd.port = cfg.server.lockdPort;
|
||||||
|
lockd.udp-port = cfg.server.lockdPort;
|
||||||
|
};
|
||||||
|
|
||||||
|
nfsConfDeprecated = cfg.extraConfig + ''
|
||||||
|
[nfsd]
|
||||||
|
threads=${toString cfg.server.nproc}
|
||||||
|
${optionalString (cfg.server.hostName != null) "host=${cfg.server.hostName}"}
|
||||||
|
${cfg.server.extraNfsdConfig}
|
||||||
|
|
||||||
|
[mountd]
|
||||||
|
${optionalString (cfg.server.mountdPort != null) "port=${toString cfg.server.mountdPort}"}
|
||||||
|
|
||||||
|
[statd]
|
||||||
|
${optionalString (cfg.server.statdPort != null) "port=${toString cfg.server.statdPort}"}
|
||||||
|
|
||||||
|
[lockd]
|
||||||
|
${optionalString (cfg.server.lockdPort != null) ''
|
||||||
|
port=${toString cfg.server.lockdPort}
|
||||||
|
udp-port=${toString cfg.server.lockdPort}
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
|
nfsConfFile =
|
||||||
|
if cfg.settings != {}
|
||||||
|
then format.generate "nfs.conf" (recursiveUpdate nfsConfSettings cfg.settings)
|
||||||
|
else pkgs.writeText "nfs.conf" nfsConfDeprecated;
|
||||||
|
|
||||||
requestKeyConfFile = pkgs.writeText "request-key.conf" ''
|
requestKeyConfFile = pkgs.writeText "request-key.conf" ''
|
||||||
create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
|
create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
|
||||||
'';
|
'';
|
||||||
|
@ -46,6 +85,19 @@ in
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
settings = mkOption {
|
||||||
|
type = format.type;
|
||||||
|
default = {};
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
General configuration for NFS daemons and tools.
|
||||||
|
See nfs.conf(5) and related man pages for details.
|
||||||
|
'';
|
||||||
|
example = literalExpression ''
|
||||||
|
{
|
||||||
|
mountd.manage-gids = true;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
default = "";
|
default = "";
|
||||||
|
@ -60,6 +112,17 @@ in
|
||||||
|
|
||||||
config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) {
|
config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) {
|
||||||
|
|
||||||
|
warnings =
|
||||||
|
(optional (cfg.extraConfig != "") ''
|
||||||
|
`services.nfs.extraConfig` is deprecated. Use `services.nfs.settings` instead.
|
||||||
|
'') ++ (optional (cfg.server.extraNfsdConfig != "") ''
|
||||||
|
`services.nfs.server.extraNfsdConfig` is deprecated. Use `services.nfs.settings` instead.
|
||||||
|
'');
|
||||||
|
assertions = [{
|
||||||
|
assertion = cfg.settings != {} -> cfg.extraConfig == "" && cfg.server.extraNfsdConfig == "";
|
||||||
|
message = "`services.nfs.settings` cannot be used together with `services.nfs.extraConfig` and `services.nfs.server.extraNfsdConfig`.";
|
||||||
|
}];
|
||||||
|
|
||||||
services.rpcbind.enable = true;
|
services.rpcbind.enable = true;
|
||||||
|
|
||||||
services.nfs.idmapd.settings = {
|
services.nfs.idmapd.settings = {
|
||||||
|
|
Loading…
Reference in a new issue