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

Merge branch '1.0-develop' into develop

Browse Source
This commit is contained in:
Matthew Penner 2024-06-29 13:00:25 -06:00
commit 64c789712f
No known key found for this signature in database
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Allocations/AssignmentService.php
View File

@ -14,7 +14,7 @@ use Pterodactyl\Exceptions\Service\Allocation\TooManyPortsInRangeException;
class AssignmentService class AssignmentService
{ {
public const CIDR_MAX_BITS = 27; public const CIDR_MAX_BITS = 25;
public const CIDR_MIN_BITS = 32; public const CIDR_MIN_BITS = 32;
public const PORT_FLOOR = 1024; public const PORT_FLOOR = 1024;
public const PORT_CEIL = 65535; public const PORT_CEIL = 65535;

6
app/Services/Eggs/EggConfigurationService.php
View File

@ -64,12 +64,6 @@ class EggConfigurationService
} }
$signal = substr($stop, 1); $signal = substr($stop, 1);
if (strtoupper($signal) === 'C') {
return [
'type' => 'stop',
'value' => null,
];
}
return [ return [
'type' => 'signal', 'type' => 'signal',

24
database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json
View File

@ -1,19 +1,19 @@
{ {
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
"meta": { "meta": {
"version": "PTDL_v1", "version": "PTDL_v2",
"update_url": null "update_url": null
}, },
"exported_at": "2021-06-15T17:24:18-04:00", "exported_at": "2023-01-28T00:52:56+01: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.",
"features": null, "features": null,
"images": [ "docker_images": {
"ghcr.io\/pterodactyl\/yolks:debian" "ghcr.io\/pterodactyl\/yolks:debian": "ghcr.io\/pterodactyl\/yolks:debian"
], },
"file_denylist": [], "file_denylist": [],
"startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} query_http_port={{QUERY_HTTP}} query_ssh_port={{QUERY_SSH}} query_protocols={{QUERY_PROTOCOLS_VAR}} license_accepted=1", "startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} query_http_port={{QUERY_HTTP}} query_ssh_port={{QUERY_SSH}} query_protocols={{QUERY_PROTOCOLS_VAR}} serveradmin_password={{SERVERADMIN_PASSWORD}} license_accepted=1",
"config": { "config": {
"files": "{}", "files": "{}",
"startup": "{\r\n \"done\": \"listening on 0.0.0.0:\"\r\n}", "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\"\r\n}",
@ -87,6 +87,16 @@
"user_editable": false, "user_editable": false,
"rules": "required|integer|between:1025,65535", "rules": "required|integer|between:1025,65535",
"field_type": "text" "field_type": "text"
},
{
"name": "Server Query Admin Password",
"description": "The password for the server query admin user.",
"env_variable": "SERVERADMIN_PASSWORD",
"default_value": "",
"user_viewable": true,
"user_editable": true,
"rules": "nullable|string|max:32",
"field_type": "text"
} }
] ]
} }