Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nit(minecraft-servers): remove unnecessary attrsets.

Browse source
This commit is contained in:
Infinidoge 2022-02-27 14:27:36 -05:00
parent 01d9dfa9e9
commit 7ededf6ea4
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/functionality/minecraft-servers.nix
View file

@ -48,7 +48,7 @@ in
config = mkIf cfg.enable config = mkIf cfg.enable
( (
let let
servers = attrsets.filterAttrs (_: cfg: cfg.enable) cfg.servers; servers = filterAttrs (_: cfg: cfg.enable) cfg.servers;
in in
{ {
users.users.minecraft = { users.users.minecraft = {
@ -71,10 +71,10 @@ in
networking.firewall = networking.firewall =
let let
toOpen = attrsets.filterAttrs (_: cfg: cfg.openFirewall) servers; toOpen = filterAttrs (_: cfg: cfg.openFirewall) servers;
UDPPorts = attrsets.mapAttrsToList (name: conf: conf.serverProperties.server-port or 25565) toOpen; UDPPorts = mapAttrsToList (name: conf: conf.serverProperties.server-port or 25565) toOpen;
TCPPorts = concatLists TCPPorts = concatLists
(attrsets.mapAttrsToList (mapAttrsToList
(name: conf: with conf; (name: conf: with conf;
(optional (serverProperties.enable-rcon or false) (serverProperties."rcon.port" or 25575)) ++ (optional (serverProperties.enable-rcon or false) (serverProperties."rcon.port" or 25575)) ++
(optional (serverProperties.enable-query or false) (serverProperties."query.port" or 25565)) (optional (serverProperties.enable-query or false) (serverProperties."query.port" or 25565))
@ -87,7 +87,7 @@ in
allowedTCPPorts = UDPPorts ++ TCPPorts; allowedTCPPorts = UDPPorts ++ TCPPorts;
}; };
systemd.services = attrsets.mapAttrs' systemd.services = mapAttrs'
(name: conf: (name: conf:
let let
serverDir = "${cfg.dataDir}/${name}"; serverDir = "${cfg.dataDir}/${name}";