Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-25 18:42:31 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
Some Fixes
This commit is contained in:
Anand Capur 2019-07-26 00:46:01 -04:00 committed by GitHub
commit 4f54b18ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

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

59
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8a99f4996405b8080a0dcabb2609c39d", "content-hash": "175a2431d23dd32f79b42bbc8030ace1",
"packages": [ "packages": [
{ {
"name": "appstract/laravel-blade-directives", "name": "appstract/laravel-blade-directives",
@ -46,9 +46,9 @@
"authors": [ "authors": [
{ {
"name": "Gijs Jorissen", "name": "Gijs Jorissen",
"role": "Developer",
"email": "hello@appstract.team", "email": "hello@appstract.team",
"homepage": "https://appstract.team", "homepage": "https://appstract.team"
"role": "Developer"
} }
], ],
"description": "Handy Blade directives", "description": "Handy Blade directives",
@ -973,12 +973,12 @@
"version": "3.0.0", "version": "3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ivanakimov/hashids.php.git", "url": "https://github.com/vinkla/hashids.git",
"reference": "b6c61142bfe36d43740a5419d11c351dddac0458" "reference": "b6c61142bfe36d43740a5419d11c351dddac0458"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/b6c61142bfe36d43740a5419d11c351dddac0458", "url": "https://api.github.com/repos/vinkla/hashids/zipball/b6c61142bfe36d43740a5419d11c351dddac0458",
"reference": "b6c61142bfe36d43740a5419d11c351dddac0458", "reference": "b6c61142bfe36d43740a5419d11c351dddac0458",
"shasum": "" "shasum": ""
}, },
@ -2149,8 +2149,8 @@
"authors": [ "authors": [
{ {
"name": "Antonio Carlos Ribeiro", "name": "Antonio Carlos Ribeiro",
"email": "acr@antoniocarlosribeiro.com", "role": "Creator & Designer",
"role": "Creator & Designer" "email": "acr@antoniocarlosribeiro.com"
} }
], ],
"description": "A One Time Password Authentication package, compatible with Google Authenticator.", "description": "A One Time Password Authentication package, compatible with Google Authenticator.",
@ -2259,9 +2259,9 @@
"authors": [ "authors": [
{ {
"name": "Dries Vints", "name": "Dries Vints",
"role": "Maintainer",
"email": "dries.vints@gmail.com", "email": "dries.vints@gmail.com",
"homepage": "http://driesvints.com", "homepage": "http://driesvints.com"
"role": "Maintainer"
} }
], ],
"description": "Prologue Alerts is a package that handles global site messages.", "description": "Prologue Alerts is a package that handles global site messages.",
@ -2720,9 +2720,9 @@
"authors": [ "authors": [
{ {
"name": "Jarek Tkaczyk", "name": "Jarek Tkaczyk",
"role": "Developer",
"email": "jarek@softonsofa.com", "email": "jarek@softonsofa.com",
"homepage": "https://softonsofa.com/", "homepage": "https://softonsofa.com/"
"role": "Developer"
} }
], ],
"description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.",
@ -2822,9 +2822,9 @@
"authors": [ "authors": [
{ {
"name": "Jarek Tkaczyk", "name": "Jarek Tkaczyk",
"role": "Developer",
"email": "jarek@softonsofa.com", "email": "jarek@softonsofa.com",
"homepage": "http://softonsofa.com/", "homepage": "http://softonsofa.com/"
"role": "Developer"
} }
], ],
"description": "Laravel Eloquent hooks system.", "description": "Laravel Eloquent hooks system.",
@ -4968,16 +4968,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.13.1", "version": "v2.15.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161" "reference": "20064511ab796593a3990669eff5f5b535001f7c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c",
"reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161", "reference": "20064511ab796593a3990669eff5f5b535001f7c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4986,7 +4986,7 @@
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.2",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^5.6 || >=7.0 <7.3", "php": "^5.6 || ^7.0",
"php-cs-fixer/diff": "^1.3", "php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.17 || ^4.1.6", "symfony/console": "^3.4.17 || ^4.1.6",
"symfony/event-dispatcher": "^3.0 || ^4.0", "symfony/event-dispatcher": "^3.0 || ^4.0",
@ -4998,21 +4998,18 @@
"symfony/process": "^3.0 || ^4.0", "symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0" "symfony/stopwatch": "^3.0 || ^4.0"
}, },
"conflict": {
"hhvm": "*"
},
"require-dev": { "require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.1", "keradus/cli-executor": "^1.2",
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.1", "php-coveralls/php-coveralls": "^2.1",
"php-cs-fixer/accessible-object": "^1.0", "php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
"phpunitgoodpractices/traits": "^1.5.1", "phpunitgoodpractices/traits": "^1.8",
"symfony/phpunit-bridge": "^4.0" "symfony/phpunit-bridge": "^4.3"
}, },
"suggest": { "suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.", "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@ -5055,7 +5052,7 @@
} }
], ],
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"time": "2018-10-21T00:32:10+00:00" "time": "2019-06-01T10:32:12+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
@ -6102,8 +6099,8 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de", "role": "lead",
"role": "lead" "email": "sebastian@phpunit.de"
} }
], ],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@ -6375,8 +6372,8 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de", "role": "lead",
"role": "lead" "email": "sebastian@phpunit.de"
} }
], ],
"description": "The PHP Unit Testing framework.", "description": "The PHP Unit Testing framework.",

6
database/seeds/eggs/source-engine/egg-insurgency.json
View File

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

27
database/seeds/eggs/voice-servers/egg-teamspeak3-server.json
View File

@ -3,21 +3,21 @@
"meta": { "meta": {
"version": "PTDL_v1" "version": "PTDL_v1"
}, },
"exported_at": "2019-05-01T16:35:15+00:00", "exported_at": "2019-07-05T11:59:29-04:00",
"name": "Teamspeak3 Server", "name": "Teamspeak3 Server",
"author": "support@pterodactyl.io", "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.", "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", "image": "quay.io/parkervcp/pterodactyl-images:base_debian",
"startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} license_accepted=1", "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": { "config": {
"files": "{}", "files": "{}",
"startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}", "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\",\r\n \"userInteraction\": []\r\n}",
"logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs/ts3.log\"\r\n}",
"stop": "^C" "stop": "^C"
}, },
"scripts": { "scripts": {
"installation": { "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", "container": "alpine:3.9",
"entrypoint": "ash" "entrypoint": "ash"
} }
@ -27,10 +27,19 @@
"name": "Server Version", "name": "Server Version",
"description": "The version of Teamspeak 3 to use when running the server.", "description": "The version of Teamspeak 3 to use when running the server.",
"env_variable": "TS_VERSION", "env_variable": "TS_VERSION",
"default_value": "3.7.1", "default_value": "latest",
"user_viewable": 1, "user_viewable": 1,
"user_editable": 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"
} }
] ]
} }