Merge pull request pterodactyl#1652 from pterodactyl/arc-some-fixes

Some Fixes

Author: arcdigital

composer.json

@@ -45,7 +45,7 @@
         "barryvdh/laravel-ide-helper": "^2.5",
         "codedungeon/phpunit-result-printer": "^0.17.1",
         "filp/whoops": "^2.1",
-        "friendsofphp/php-cs-fixer": "^2.11.1",
+        "friendsofphp/php-cs-fixer": "^2.15.1",
         "fzaninotto/faker": "^1.6",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",

composer.lock

@@ -27,10 +27,10 @@
             "name": "Game ID",
             "description": "The ID corresponding to the game to download and run using SRCDS.",
             "env_variable": "SRCDS_APPID",
-            "default_value": "17705",
+            "default_value": "237410",
             "user_viewable": 1,
             "user_editable": 0,
-            "rules": "required|regex:\/^(17705)$\/"
+            "rules": "required|regex:\/^(237410)$\/"
         },
         {
             "name": "Game Name",
@@ -51,4 +51,4 @@
             "rules": "required|regex:\/^(\\w{1,20})$\/"
         }
     ]
-}
+}

database/seeds/eggs/source-engine/egg-insurgency.json

@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-05-01T16:35:15+00:00",
+    "exported_at": "2019-07-05T11:59:29-04: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}}  license_accepted=1",
+    "image": "quay.io/parkervcp/pterodactyl-images:base_debian",
+    "startup": "./ts3server default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1",
     "config": {
         "files": "{}",
-        "startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}",
-        "logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}",
+        "startup": "{\r\n    \"done\": \"listening on 0.0.0.0:\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs/ts3.log\"\r\n}",
         "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 \/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",
+            "script": "#!/bin/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: /mnt/server\r\napk add --no-cache tar curl jq\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n    TS_VERSION=$(wget https://teamspeak.com/versions/server.json -qO - | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd /mnt/server\r\n\r\n\r\necho -e \"getting files from http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\"\r\ncurl http://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1",
             "container": "alpine:3.9",
             "entrypoint": "ash"
         }
@@ -27,10 +27,19 @@
             "name": "Server Version",
             "description": "The version of Teamspeak 3 to use when running the server.",
             "env_variable": "TS_VERSION",
-            "default_value": "3.7.1",
+            "default_value": "latest",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/"
+            "rules": "required|string|max:6"
+        },
+        {
+            "name": "File Transfer Port",
+            "description": "The Teamspeak file transfer port",
+            "env_variable": "FILE_TRANSFER",
+            "default_value": "30033",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|integer|between:1,65535"
         }
     ]
-}
+}