From f5d701cbc8d4252774c5979ce849d063d8f62f08 Mon Sep 17 00:00:00 2001 From: Fabian <11352551+fabm3n@users.noreply.github.com> Date: Sun, 28 Oct 2018 20:34:56 +0100 Subject: [PATCH 1/3] Updated TS3 Server egg New minimal Script based on bash. ts3server.ini is not needed, because its only used when the server get started with the inifile=ts3server.ini parameter. Also the license aggrement moved to the parameter. --- .../eggs/voice-servers/egg-teamspeak3-server.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json index e2736c726..7df63967c 100644 --- a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json @@ -3,23 +3,23 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-01-21T17:01:45-06:00", + "exported_at": "2018-10-28T20:28:22+01:00", "name": "Teamspeak3 Server", "author": "support@pterodactyl.io", "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", "image": "quay.io\/pterodactyl\/core:glibc", - "startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}}", + "startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} license_accepted=1", "config": { - "files": "{\"ts3server.ini\":{\"parser\": \"ini\", \"find\":{\"default_voice_port\": \"{{server.build.default.port}}\", \"voice_ip\": \"0.0.0.0\", \"query_port\": \"{{server.build.default.port}}\", \"query_ip\": \"0.0.0.0\"}}}", + "files": "{}", "startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}", "logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/tmp\n\ncurl -sSLO http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\n\ntar -xjvf teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\ncp -r teamspeak3-server_linux_amd64\/* \/mnt\/server\n\necho \"machine_id=\ndefault_voice_port=${SERVER_PORT}\nvoice_ip=0.0.0.0\nlicensepath=\nfiletransfer_port=30033\nfiletransfer_ip=\nquery_port=${SERVER_PORT}\nquery_ip=0.0.0.0\nquery_ip_whitelist=query_ip_whitelist.txt\nquery_ip_blacklist=query_ip_blacklist.txt\ndbplugin=ts3db_sqlite3\ndbpluginparameter=\ndbsqlpath=sql\/\ndbsqlcreatepath=create_sqlite\/\ndbconnections=10\nlogpath=logs\nlogquerycommands=0\ndbclientkeepdays=30\nlogappend=0\nquery_skipbruteforcecheck=0\" > \/mnt\/server\/ts3server.ini\n\ntouch \/mnt\/server\/.ts3server_license_accepted", - "container": "alpine:3.4", - "entrypoint": "ash" + "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y install --no-install-recommends tar curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "container": "ubuntu:18.04", + "entrypoint": "bash" } }, "variables": [ From 10f37adca862d0d6bcc224bc8e35605d283b1ec6 Mon Sep 17 00:00:00 2001 From: Fabian <11352551+fabm3n@users.noreply.github.com> Date: Sun, 28 Oct 2018 20:51:36 +0100 Subject: [PATCH 2/3] Updated Teamspeak 3 Server Egg Changed to alpine container --- .../seeds/eggs/voice-servers/egg-teamspeak3-server.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json index 7df63967c..aba7a2424 100644 --- a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-28T20:28:22+01:00", + "exported_at": "2018-10-28T20:50:23+01:00", "name": "Teamspeak3 Server", "author": "support@pterodactyl.io", "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y install --no-install-recommends tar curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", - "container": "ubuntu:18.04", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add tar curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "container": "alpine:3.4", + "entrypoint": "ash" } }, "variables": [ From 34ff6511a67f155d2d240ac7634059d48e5eea04 Mon Sep 17 00:00:00 2001 From: Fabian <11352551+fabm3n@users.noreply.github.com> Date: Sun, 28 Oct 2018 21:13:03 +0100 Subject: [PATCH 3/3] Remove \r Removed \r --- database/seeds/eggs/voice-servers/egg-teamspeak3-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json index aba7a2424..0176cd13e 100644 --- a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add tar curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/mnt\/server\n\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", "container": "alpine:3.4", "entrypoint": "ash" }