From ed36d650af236026f1fc30307166cf9dd2867703 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 22 Oct 2019 00:34:08 +0200
Subject: [PATCH] =?UTF-8?q?minecraft:=20serveur=20d=C3=A9port=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 systems/LoutreOS/configuration.nix          | 2 ++
 systems/LoutreOS/hardware-configuration.nix | 5 +++++
 systems/LoutreOS/services.nix               | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix
index 3cb1df7d8..29aa22ba6 100644
--- a/systems/LoutreOS/configuration.nix
+++ b/systems/LoutreOS/configuration.nix
@@ -83,6 +83,7 @@ in
       internalInterfaces = [ "eno2" ];
       forwardPorts = [
         { destination = "10.30.0.1:22"; proto = "tcp"; sourcePort = 8443;}
+        { destination = "10.30.135.35:25565"; proto = "tcp"; sourcePort = 25565; loopbackIPs=[ "195.36.180.44" ];}
       ];
     };
 
@@ -109,6 +110,7 @@ in
     machines = [
       { ethernetAddress = "50:c7:bf:b6:b8:ef"; hostName = "HS110"; ipAddress = "10.30.50.7"; }
       { ethernetAddress = "ac:1f:6b:4b:01:15"; hostName = "IPMI"; ipAddress = "10.30.1.1"; }
+      { ethernetAddress = "00:1f:c6:6e:d1:f1"; hostName = "minecraftos"; ipAddress = "10.30.135.35"; }
     ];
     extraConfig = ''
       option domain-name-servers 89.234.141.66, 80.67.169.12, 80.67.169.40;
diff --git a/systems/LoutreOS/hardware-configuration.nix b/systems/LoutreOS/hardware-configuration.nix
index 436363e70..bc18a465e 100644
--- a/systems/LoutreOS/hardware-configuration.nix
+++ b/systems/LoutreOS/hardware-configuration.nix
@@ -142,6 +142,11 @@
       fsType = "zfs";
     };
 
+  fileSystems."/var/lib/minecraft" =
+    { device = "loutrepool/var/minecraft";
+      fsType = "zfs";
+    };
+
   swapDevices =
     [
       {
diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix
index 1a36b6e37..158b7af44 100644
--- a/systems/LoutreOS/services.nix
+++ b/systems/LoutreOS/services.nix
@@ -211,6 +211,7 @@ in
       exports = ''
         /mnt/medias  10.30.0.0/16(ro,no_root_squash)
         /exports/steam  10.30.0.0/16(rw,async,no_root_squash)
+        /var/lib/minecraft  10.30.0.0/16(rw,no_root_squash)
       '';
       statdPort = 4000;
       lockdPort = 4001;
@@ -456,7 +457,7 @@ in
     };
 
     minecraft-server = {
-      enable = true;
+      enable = false;
       jvmOpts = "-Xms512m -Xmx3072m";
       eula = true;
       declarative = true;