From 65a09c22a4666bb772af4d67da71b3c4b0886da7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 27 Oct 2020 22:51:35 +0100
Subject: l domsen: upgrade to nextcloud 19

---
 lass/2configs/websites/domsen.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index a177a0228..899a3ae69 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";
-- 
cgit v1.2.3


From d703e20158ad80e71641255b9fb247092f3ba28e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 29 Oct 2020 08:50:18 +0100
Subject: l minecraft: use minecraft-server

---
 lass/2configs/minecraft.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'lass/2configs')

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"; }
-- 
cgit v1.2.3


From 30f73aab5de2649c03f88c5e61715790ad9f1350 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 29 Oct 2020 11:50:16 +0100
Subject: l domsen: add XANF_TEAM user

---
 lass/2configs/websites/domsen.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 899a3ae69..78cfb29cd 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -175,6 +175,7 @@ in {
 
   users.users.xanf = {
     uid = genid_uint31 "xanf";
+    group = "xanf";
     home = "/home/xanf";
     useDefaultShell = true;
     createHome = true;
@@ -252,6 +253,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;
-- 
cgit v1.2.3