diff --git a/jobs/games/minecraft/magma.hcl b/jobs/games/minecraft/magma.hcl index a147ef8..335108c 100644 --- a/jobs/games/minecraft/magma.hcl +++ b/jobs/games/minecraft/magma.hcl @@ -1,14 +1,14 @@ -job "minecraft" { +job "minecraft-magma" { datacenters = ["aperture"] - type = "service" + type = "service" - group "fabric" { + group "fabric-server" { count = 1 network { port "minecraft" { - static = 25566 - to = 25565 + static = 25572 + to = 25565 } port "rcon" { to = 25575 @@ -19,32 +19,33 @@ job "minecraft" { } service { - name = "fabric" + name = "minecraft-magma" + port = "minecraft" } - task "fabric-server" { + task "minecraft-magma" { driver = "docker" config { image = "itzg/minecraft-server:java17-alpine" - ports = ["minecraft","rcon","voicechat"] + ports = ["minecraft", "rcon", "voicechat"] volumes = [ "/storage/nomad/${NOMAD_TASK_NAME}:/data" ] } resources { - cpu = 3000 # 3GHz + cpu = 3000 # 3GHz memory = 10240 # 10GB } env { - EULA = "TRUE" - TYPE = "FABRIC" - VERSION = "1.20.4" - ICON = "https://raw.githubusercontent.com/redbrick/design-system/main/assets/logos/logo.png" - MEMORY = "8G" - USE_AIKAR_FLAGS=true - JVM_XX_OPTS = "-XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32" + EULA = "TRUE" + TYPE = "FABRIC" + VERSION = "1.20.4" + ICON = "https://raw.githubusercontent.com/redbrick/design-system/main/assets/logos/logo.png" + MEMORY = "8G" + USE_AIKAR_FLAGS = true + JVM_XX_OPTS = "-XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32" } } } diff --git a/jobs/ingress/gate-proxy.hcl b/jobs/ingress/gate-proxy.hcl index 55a2aa8..8039cbb 100644 --- a/jobs/ingress/gate-proxy.hcl +++ b/jobs/ingress/gate-proxy.hcl @@ -1,7 +1,7 @@ job "gate-proxy" { datacenters = ["aperture"] - node_pool = "ingress" - type = "service" + node_pool = "ingress" + type = "service" group "gate-proxy" { count = 1 @@ -16,9 +16,9 @@ job "gate-proxy" { port = "mc" check { - type = "tcp" + type = "tcp" interval = "10s" - timeout = "2s" + timeout = "2s" } } @@ -35,7 +35,7 @@ job "gate-proxy" { } template { - data = <