From 79a47bfe88d86c8cd9883e8e49fd3468465518c0 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 12 Aug 2019 22:08:35 -0400 Subject: [PATCH 1/3] update to fix the xml parsing should resolve #279 --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 4e9fcb36..dc2f7642 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-25T14:08:07-04:00", + "exported_at": "2019-08-12T22:06:45-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.GAME_DIFFICULTY}} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081'", "config": { - "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerSettings.property name=\\\"ServerPort\\\"\": \"value=\\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" Date: Fri, 30 Aug 2019 20:28:46 -0400 Subject: [PATCH 2/3] update 7dtd egg fix the bad parser. --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index dc2f7642..9cbe9056 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-12T22:06:45-04:00", + "exported_at": "2019-08-30T20:28:24-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.GAME_DIFFICULTY}} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081'", "config": { - "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" \"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "shutdown" From 9a6fac26e4a514c9b332216cbc184127ff20d315 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 30 Aug 2019 20:43:24 -0400 Subject: [PATCH 3/3] update start command No longer need to edit the config as we set the port on startup --- source_servers/7_days_to_die/egg-7-days-to-die.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 9cbe9056..3a1d4165 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-30T20:28:24-04:00", + "exported_at": "2019-08-30T20:42:59-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.GAME_DIFFICULTY}} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081'", + "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=$SERVER_PORT -ServerMaxPlayerCount=$MAX_PLAYERS -GameDifficulty=$GAME_DIFFICULTY -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081'", "config": { - "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" \"\r\n }\r\n }\r\n}", + "files": "{}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "shutdown"