refactor: prepend squad in mkServerName

This commit is contained in:
Price Hiller 2023-12-18 10:32:25 -06:00
parent 268af657c3
commit fa51273b80
Signed by: Price
SSH Key Fingerprint: SHA256:Y4S9ZzYphRn1W1kbJerJFO6GGsfu9O70VaBSxJO7dF8

View File

@ -773,7 +773,7 @@ in
# Credit to https://github.com/mkaito/nixos-modded-minecraft-servers/tree/master. # Credit to https://github.com/mkaito/nixos-modded-minecraft-servers/tree/master.
# A fair bit of the handling of the nested servers was based upon the code there. # A fair bit of the handling of the nested servers was based upon the code there.
enabledServers = lib.filterAttrs (_: conf: conf.enable) cfg.servers; enabledServers = lib.filterAttrs (_: conf: conf.enable) cfg.servers;
mkServerName = name: replaceNonAlum "-" name; mkServerName = name: "squad-${replaceNonAlum "-" name}";
eachEnabledServer = f: lib.mapAttrs' (name: config: lib.nameValuePair (mkServerName name) (f name config)) enabledServers; eachEnabledServer = f: lib.mapAttrs' (name: config: lib.nameValuePair (mkServerName name) (f name config)) enabledServers;
collectPorts = portType: lib.lists.flatten (lib.mapAttrsToList (_: serverConfig: serverConfig.${portType}) enabledServers); collectPorts = portType: lib.lists.flatten (lib.mapAttrsToList (_: serverConfig: serverConfig.${portType}) enabledServers);
gamePorts = collectPorts "gamePort"; gamePorts = collectPorts "gamePort";