From 934ab7978b824e1cd7a9e8d8284e9fc2cd325eb1 Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Sat, 7 Dec 2024 18:59:51 +0100
Subject: Allow global and tailnet ports in foundation

Signed-off-by: Mel <einebeere@gmail.com>
---
 services/minecraft.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'services/minecraft.nix')

diff --git a/services/minecraft.nix b/services/minecraft.nix
index cd04e31..0690f40 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -28,16 +28,11 @@ in
 {
   networking.firewall.allowedTCPPorts = [ minecraftPort ];
 
-  # TODO: put global ports into foundation
-  virtualisation.oci-containers.containers.minecraft = {
-    imageStream = minecraftImage;
-    image = "minecraft:${minecraft.version}";
-    # expose minecraft service port globally.
-    ports = [ "0.0.0.0:${toString minecraftPort}:${toString minecraftPort}" ];
-
-    volumes = [
-      "${minecraftDir}:/server"
-    ];
+  foundation.services.minecraft = {
+    image = minecraftImage;
+    ports = [ (common.globalPort minecraftPort) ];
+
+    volumes = [ [ "${minecraftDir}" "/server" ] ];
 
     workdir = "/server";
     entrypoint = "${minecraft}/bin/minecraft-server";
-- 
cgit 1.4.1