tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Update to NixOS 21.11 #54

Manually merged
tlater merged 5 commits from tlater/21.11 into master 2022-01-08 02:20:03 +00:00
Conversation 0 Commits 5 Files changed 8 +28 -11
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bd7e4a3193 - Show all commits

6
configuration/ids.nix
View file

@ -4,6 +4,12 @@
ids.uids = {
# System user ids start at 400 (see nixos/modules/programs/shadow.nix)
webserver = 400;
minecraft = 401;
# The limit is 999
};
ids.gids = {
webserver = 400;
minecraft = 401;
};
}

15
configuration/services/minecraft.nix
View file

@ -54,6 +54,16 @@ in {
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "forge-server" ];
users = {
extraUsers.minecraft = {
uid = config.ids.uids.minecraft;
group = config.users.extraGroups.minecraft.name;
isSystemUser = true;
description = "Minecraft server user";
};
extraGroups.minecraft = { gid = config.ids.gids.minecraft; };
};
virtualisation.oci-containers.containers.minecraft-voor-kia = let
properties = ./configs/minecraft/voor-kia/server.properties;
icon = ./configs/minecraft/voor-kia/server-icon.png;
@ -73,9 +83,8 @@ in {
];
config = let
# Use the upstream minecraft uid
uid = toString config.ids.uids.minecraft;
gid = toString config.users.groups.nogroup.gid;
uid = toString config.users.extraUsers.minecraft.uid;
gid = toString config.users.extraGroups.minecraft.gid;
in {
Cmd = [ "forge-server" ] ++ minecraft-server-args;
WorkingDir = "/var/lib/minecraft";

18
configuration/services/webserver.nix
View file

@ -1,10 +1,14 @@
{ config, pkgs, ... }:
{
users.extraUsers.webserver = {
uid = config.ids.uids.webserver;
isSystemUser = true;
description = "tlater.net web server user";
users = {
extraUsers.webserver = {
uid = config.ids.uids.webserver;
group = config.users.extraGroups.webserver.name;
isSystemUser = true;
description = "tlater.net web server user";
};
extraGroups.webserver = { gid = config.ids.gids.webserver; };
};
virtualisation.oci-containers.containers.webserver = {
@ -16,10 +20,8 @@
contents = pkgs.tlaternet-webserver.webserver;
config = let
user = config.users.extraUsers.webserver;
group = config.users.groups.${user.group};
uid = toString user.uid;
gid = toString group.gid;
uid = toString config.users.extraUsers.webserver.uid;
gid = toString config.users.extraGroups.webserver.gid;
in {
Cmd = [ "tlaternet-webserver" ];
Volumes = { "/srv/mail" = { }; };