From 51ce4d4d4771cc39eb3efa77d2b0262bc223a658 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 14 Dec 2016 18:54:02 -0500
Subject: [PATCH] Update existing configs

---
 storage/app/services/minecraft/main.json | 17 ++++++++++++-----
 storage/app/services/terraria/main.json  |  4 ++--
 storage/app/services/voice/main.json     | 10 +++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/storage/app/services/minecraft/main.json b/storage/app/services/minecraft/main.json
index b131d9885..48a490cb3 100644
--- a/storage/app/services/minecraft/main.json
+++ b/storage/app/services/minecraft/main.json
@@ -13,8 +13,8 @@
                 "find": {
                     "server-ip": "0.0.0.0",
                     "enable-query": "true",
-                    "server-port": "{{ build.default.port }}",
-                    "query.port": "{{ build.default.port }}"
+                    "server-port": "{{ server.build.default.port }}",
+                    "query.port": "{{ server.build.default.port }}"
                 }
             }
         },
@@ -37,7 +37,10 @@
     },
     "bungeecord": {
         "startup": {
-            "done": "Listening on "
+            "done": "Listening on ",
+            "userInteraction": [
+                "Listening on /0.0.0.0:25577"
+            ]
         },
         "stop": "end",
         "configs": {
@@ -45,8 +48,12 @@
                 "parser": "yaml",
                 "find": {
                     "listeners[0].query_enabled": true,
-                    "listeners[0].query_port": "{{ build.default.port }}",
-                    "listeners[0].host": "0.0.0.0:{{ build.default.port }}"
+                    "listeners[0].query_port": "{{ server.build.default.port }}",
+                    "listeners[0].host": "0.0.0.0:{{ server.build.default.port }}",
+                    "servers.*.address": {
+                        "127.0.0.1": "{{ config.docker.interface }}",
+                        "localhost": "{{ config.docker.interface }}"
+                    }
                 }
             }
         },
diff --git a/storage/app/services/terraria/main.json b/storage/app/services/terraria/main.json
index 6eacd7498..78f1b5bc0 100644
--- a/storage/app/services/terraria/main.json
+++ b/storage/app/services/terraria/main.json
@@ -9,8 +9,8 @@
             "tshock/config.json": {
                 "parser": "json",
                 "find": {
-                    "ServerPort": "{{ build.default.port }}",
-                    "MaxSlots": "{{ build.env.MAX_SLOTS }}"
+                    "ServerPort": "{{ server.build.default.port }}",
+                    "MaxSlots": "{{ server.build.env.MAX_SLOTS }}"
                 }
             }
         },
diff --git a/storage/app/services/voice/main.json b/storage/app/services/voice/main.json
index 6bc8e5c95..bc7232f46 100644
--- a/storage/app/services/voice/main.json
+++ b/storage/app/services/voice/main.json
@@ -12,9 +12,9 @@
                 "parser": "ini",
                 "find": {
                     "logfile": "murmur.log",
-                    "port": "{{ build.default.port }}",
+                    "port": "{{ server.build.default.port }}",
                     "host": "0.0.0.0",
-                    "users": "{{ build.env.MAX_USERS }}"
+                    "users": "{{ server.build.env.MAX_USERS }}"
                 }
             }
         },
@@ -24,7 +24,7 @@
         },
         "query": "mumbleping"
     },
-    "teamspeak": {
+    "ts3": {
         "startup": {
             "done": "listening on 0.0.0.0:",
             "userInteraction": []
@@ -34,9 +34,9 @@
             "ts3server.ini": {
                 "parser": "ini",
                 "find": {
-                    "default_voice_port": "{{ build.default.port }}",
+                    "default_voice_port": "{{ server.build.default.port }}",
                     "voice_ip": "0.0.0.0",
-                    "query_port": "{{ build.default.port }}",
+                    "query_port": "{{ server.build.default.port }}",
                     "query_ip": "0.0.0.0"
                 }
             }