From 224ebee5c20b67ab2ab6e9ed8f9d77cda682cf5a Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Sat, 22 Aug 2020 17:12:13 +0200
Subject: [PATCH] Run terraria over haproxy

---
 frontend.yml   | 3 +++
 games.yml      | 5 ++---
 group_vars/all | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend.yml b/frontend.yml
index dbc30ae..f042c5d 100644
--- a/frontend.yml
+++ b/frontend.yml
@@ -6,6 +6,8 @@
                 - { port: "{{ haproxy.ports.https }}", ipv: "v6", proto: "tcp" }
                 - { port: "2442", ipv: "v4", proto: "tcp" }
                 - { port: "2442", ipv: "v6", proto: "tcp" }
+                - { port: "7777", ipv: "v4", proto: "tcp" }
+                - { port: "7777", ipv: "v6", proto: "tcp" }
                 - { port: "64738", ipv: "v4", proto: "tcp" }
                 - { port: "64738", ipv: "v6", proto: "tcp" }
                 - { port: "25565", ipv: "v4", proto: "tcp" }
@@ -35,6 +37,7 @@
                                 - {expose: 2442, proxy: 2443, group: "dev"}             # Gitea SSH
                                 - {expose: 64738, proxy: "{{ global.social.murmur.port }}", group: "social"}          # Mumble
                                 - {expose: 25565, proxy: "{{ global.games.minecraft.port }}", group: "games"}          # Minecraft
+                                - {expose: 7777, proxy: "{{ global.games.terraria.port }}", group: "games"}          # Terraria
                 redirect:
                         prefix:
                                 - { pfx: "/web", acl: '{ hdr_beg(host) -i seed } { url / }' }
diff --git a/games.yml b/games.yml
index 7bafce5..8c6d23b 100644
--- a/games.yml
+++ b/games.yml
@@ -37,7 +37,8 @@
         terraria:
                 world: "Main"
                 bind:
-                        port: "7777"
+                        ip: "{{ ansible_ens10.ipv4.address }}"
+                        port: "{{ global.games.terraria.port }}"
                 paths:
                         data: "/mnt/terraria"
                 configs:
@@ -96,8 +97,6 @@
         firewall:
                 - { port: "{{ factorio.bind.port }}", ipv: "v4", proto: "udp" }
                 - { port: "{{ factorio.bind.port }}", ipv: "v6", proto: "udp" }
-                - { port: "{{ terraria.bind.port }}", ipv: "v4", proto: "tcp" }
-                - { port: "{{ terraria.bind.port }}", ipv: "v6", proto: "tcp" }
   roles:
         - vault
         - mounts
diff --git a/group_vars/all b/group_vars/all
index 181d00b..d41b44d 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -40,3 +40,5 @@ global:
                         port: 25560
                 factorio:
                         port: 2333
+                terraria:
+                        port: 7776