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

rpcbind service: use upstream systemd unit

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-01-29 20:06:17 +03:00
parent 314f187b0a
commit 876a6d7f03
2 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -286,6 +286,7 @@
gogs = 268; gogs = 268;
pdns-recursor = 269; pdns-recursor = 269;
kresd = 270; kresd = 270;
rpc = 271;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -541,6 +542,7 @@
couchpotato = 267; couchpotato = 267;
gogs = 268; gogs = 268;
kresd = 270; kresd = 270;
#rpc = 271; # unused
# When adding a gid, make sure it doesn't match an existing # When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal # uid. Users and groups with the same name should have equal

48
nixos/modules/services/networking/rpcbind.nix
View File

@ -2,35 +2,6 @@
with lib; with lib;
let
netconfigFile = {
target = "netconfig";
source = pkgs.writeText "netconfig" ''
#
# The network configuration file. This file is currently only used in
# conjunction with the TI-RPC code in the libtirpc library.
#
# Entries consist of:
#
# <network_id> <semantics> <flags> <protofamily> <protoname> \
# <device> <nametoaddr_libs>
#
# The <device> and <nametoaddr_libs> fields are always empty in this
# implementation.
#
udp tpi_clts v inet udp - -
tcp tpi_cots_ord v inet tcp - -
udp6 tpi_clts v inet6 udp - -
tcp6 tpi_cots_ord v inet6 tcp - -
rawip tpi_raw - inet - - -
local tpi_cots_ord - loopback - - -
unix tpi_cots_ord - loopback - - -
'';
};
in
{ {
###### interface ###### interface
@ -58,25 +29,18 @@ in
###### implementation ###### implementation
config = mkIf config.services.rpcbind.enable { config = mkIf config.services.rpcbind.enable {
environment.systemPackages = [ pkgs.rpcbind ]; environment.systemPackages = [ pkgs.rpcbind ];
environment.etc = [ netconfigFile ]; systemd.packages = [ pkgs.rpcbind ];
systemd.services.rpcbind =
{ description = "ONC RPC Directory Service";
systemd.services.rpcbind = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "basic.target" ];
after = [ "basic.target" ];
unitConfig.DefaultDependencies = false; # don't stop during shutdown
serviceConfig.Type = "forking";
serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind";
}; };
users.extraUsers.rpc = {
group = "nogroup";
uid = config.ids.uids.rpc;
};
}; };
} }