diff options
| -rw-r--r-- | lass/2configs/minecraft.nix | 22 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 13 |
2 files changed, 20 insertions, 15 deletions
diff --git a/lass/2configs/minecraft.nix b/lass/2configs/minecraft.nix index 6f8ceb358..d2a3672c5 100644 --- a/lass/2configs/minecraft.nix +++ b/lass/2configs/minecraft.nix @@ -1,19 +1,13 @@ -{ pkgs, ... }: +{ pkgs, ... }: let -{ - users.users = { - mc = { - name = "mc"; - description = "user playing mc"; - home = "/home/mc"; - createHome = true; - useDefaultShell = true; - packages = with pkgs; [ - tmux - ]; - }; + unstable = import <nixpkgs-unstable> { config.allowUnfree = true; }; + +in { + services.minecraft-server = { + enable = true; + eula = true; + package = unstable.minecraft-server; }; - krebs.per-user.mc.packages = [ pkgs.jdk ]; krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p tcp --dport 25565"; target = "ACCEPT"; } { predicate = "-p udp --dport 25565"; target = "ACCEPT"; } diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 0714d9374..ac7db10f5 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -91,7 +91,7 @@ in { services.nextcloud = { enable = true; hostName = "o.xanf.org"; - package = pkgs.nextcloud18; + package = pkgs.nextcloud19; config = { adminpassFile = toString <secrets> + "/nextcloud_pw"; overwriteProtocol = "https"; @@ -174,6 +174,7 @@ in { users.users.xanf = { uid = genid_uint31 "xanf"; + group = "xanf"; home = "/home/xanf"; useDefaultShell = true; createHome = true; @@ -251,6 +252,16 @@ in { createHome = true; }; + users.users.XANF_TEAM = { + uid = genid_uint31 "XANF_TEAM"; + group = "xanf"; + home = "/home/XANF_TEAM"; + useDefaultShell = true; + createHome = true; + }; + + users.groups.xanf = {}; + krebs.on-failure.plans.restic-backups-domsen = { journalctl = { lines = 1000; |