From 0d1cc5181821a3b760136f48e0f0420edd78e84a Mon Sep 17 00:00:00 2001
From: wizzdom <wizzdom@redbrick.dcu.ie>
Date: Thu, 11 Apr 2024 14:49:40 +0100
Subject: [PATCH] Update MC conf for fugatives and regaus (#38)

Co-authored-by: hypnoant <gholahan9@gmail.com>
---
 jobs/games/minecraft.hcl    | 95 ++++++++++++++++++++++++++++++++++++-
 jobs/ingress/gate-proxy.hcl |  7 +++
 2 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/jobs/games/minecraft.hcl b/jobs/games/minecraft.hcl
index 8cd5cac..92417b3 100644
--- a/jobs/games/minecraft.hcl
+++ b/jobs/games/minecraft.hcl
@@ -45,6 +45,49 @@ job "minecraft" {
     }
   }
 
+  group "fugitives-mc" {
+    count = 1
+
+    network {
+      port "mc-fugitives-port" {
+        static = 25570
+        to = 25565
+      }
+      port "mc-fugitives-rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "fugitives-mc"
+    }
+
+    task "minecraft-fugitives" {
+      driver = "docker"
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc-fugitives-port","mc-fugitives-rcon"]
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 8192 # 8GB
+      }
+
+      env {
+        EULA = "TRUE"
+        TYPE = "PAPER"
+        USE_AIKAR_FLAGS=true
+        MOTD = "Fugitives"
+        MAX_PLAYERS = "20"
+        MEMORY = "6G"
+      }
+    }
+  }
+
   group "games-mc" {
     count = 1
 
@@ -103,6 +146,9 @@ job "minecraft" {
       port "mc-olim909-rcon" {
         to = 25575
       }
+      port "mc-olim909-geyser" {
+        to = 19132
+      }
     }
 
     service {
@@ -114,7 +160,7 @@ job "minecraft" {
 
       config {
         image = "itzg/minecraft-server"
-        ports = ["mc-olim909-port","mc-olim909-rcon"]
+        ports = ["mc-olim909-port","mc-olim909-rcon","mc-olim909-geyser"]
 
         volumes = [
           "/storage/nomad/${NOMAD_TASK_NAME}:/data"
@@ -136,4 +182,51 @@ job "minecraft" {
       }
     }
   }
+
+  group "regaus-mc" {
+    count = 1
+
+    network {
+      port "mc-regaus-port" {
+        static = 25566
+        to = 25565
+      }
+
+      port "mc-regaus-rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "regaus-mc"
+    }
+
+    task "minecraft-regaus" {
+      driver = "docker"
+
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc-regaus-port","mc-regaus-rcon"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 4096 # 4GB
+      }
+
+      env {
+        EULA = "TRUE"
+        TYPE = "PAPER"
+        VERSION = "1.20.4"
+        USE_AIKAR_FLAGS=true
+        OPS = "regaus"
+        MAX_PLAYERS = "5"
+      }
+    }
+  }
 }
+
diff --git a/jobs/ingress/gate-proxy.hcl b/jobs/ingress/gate-proxy.hcl
index d78afb0..fd3f857 100644
--- a/jobs/ingress/gate-proxy.hcl
+++ b/jobs/ingress/gate-proxy.hcl
@@ -52,6 +52,12 @@ config:
         backend: vanilla-mc.service.consul:25567
       - host: olim909.rb.dcu.ie
         backend: olim909-mc.service.consul:25568
+      - host: olim909-geyser.rb.dcu.ie
+        backend: olim909-mc.service.consul:19132
+      - host: fugatives.rb.dcu.ie
+        backend: fugatives-mc.service.consul:25570
+      - host: regaus.rb.dcu.ie
+        backend: regaus-mc.service.consul:25566
       - host: games.rb.dcu.ie
         backend: games-mc.service.consul:25569
 EOH
@@ -60,3 +66,4 @@ EOH
     }
   }
 }
+