From 512cfad6bf5849c70476cd4bf3b3e290e09b0cb5 Mon Sep 17 00:00:00 2001 From: Ivy Date: Sat, 29 Jun 2024 20:20:35 +0200 Subject: [PATCH 1/6] chore: change "Github" to "GitHub" for consistency (#4946) --- resources/views/admin/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index ed26a92ab..817766e09 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -44,7 +44,7 @@
 
- +
From 466dd6185652ee401acf38fb8b494f12831d64b1 Mon Sep 17 00:00:00 2001 From: BeastGamer81 <57034210+BeastGamer81@users.noreply.github.com> Date: Sat, 29 Jun 2024 23:52:11 +0530 Subject: [PATCH 2/6] chore: fix "Manager User" typo in admin page title (#5114) --- resources/views/admin/users/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/users/view.blade.php b/resources/views/admin/users/view.blade.php index f042d892d..f2a03329b 100644 --- a/resources/views/admin/users/view.blade.php +++ b/resources/views/admin/users/view.blade.php @@ -1,7 +1,7 @@ @extends('layouts.admin') @section('title') - Manager User: {{ $user->username }} + Manage User: {{ $user->username }} @endsection @section('content-header') From 844537df38cbaa3a7c5e032002675af6b4f0dce7 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 30 Jun 2024 02:24:10 +0800 Subject: [PATCH 3/6] fix: CIDR_MAX_BITS restricting to `/27` instead of `/25` (#5111) --- app/Services/Allocations/AssignmentService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Allocations/AssignmentService.php b/app/Services/Allocations/AssignmentService.php index 54994ee72..821255d49 100644 --- a/app/Services/Allocations/AssignmentService.php +++ b/app/Services/Allocations/AssignmentService.php @@ -14,7 +14,7 @@ use Pterodactyl\Exceptions\Service\Allocation\TooManyPortsInRangeException; class AssignmentService { - public const CIDR_MAX_BITS = 27; + public const CIDR_MAX_BITS = 25; public const CIDR_MIN_BITS = 32; public const PORT_FLOOR = 1024; public const PORT_CEIL = 65535; From 2611cdf426e71cda981c4dbe48933456474f2dec Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 30 Jun 2024 02:24:43 +0800 Subject: [PATCH 4/6] egg(teamspeak): add server admin password variable (#5099) Co-authored-by: Panda260 --- .../voice-servers/egg-teamspeak3-server.json | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json index ef15f1ca0..01f7360bc 100644 --- a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json @@ -1,19 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-06-15T17:24:18-04:00", + "exported_at": "2023-01-28T00:52:56+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.", "features": null, - "images": [ - "ghcr.io\/pterodactyl\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/pterodactyl\/yolks:debian": "ghcr.io\/pterodactyl\/yolks:debian" + }, "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": { "files": "{}", "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\"\r\n}", @@ -87,6 +87,16 @@ "user_editable": false, "rules": "required|integer|between:1025,65535", "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" } ] -} +} \ No newline at end of file From 953575ff5c63d5e53a315fbedddace1293597e12 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 30 Jun 2024 02:31:10 +0800 Subject: [PATCH 5/6] fix: remove special handling for `^C` stop command (#5132) --- app/Services/Eggs/EggConfigurationService.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/Services/Eggs/EggConfigurationService.php b/app/Services/Eggs/EggConfigurationService.php index 4a61c2ea6..7eb10ed18 100644 --- a/app/Services/Eggs/EggConfigurationService.php +++ b/app/Services/Eggs/EggConfigurationService.php @@ -64,12 +64,6 @@ class EggConfigurationService } $signal = substr($stop, 1); - if (strtoupper($signal) === 'C') { - return [ - 'type' => 'stop', - 'value' => null, - ]; - } return [ 'type' => 'signal', From 8ae76c38890f762247a8e32a78fa97267798246e Mon Sep 17 00:00:00 2001 From: Dawid Jaworski Date: Sat, 29 Jun 2024 20:59:05 +0200 Subject: [PATCH 6/6] feat: add egg features editor in Admin UI (#5130) --- app/Http/Requests/Admin/Egg/EggFormRequest.php | 2 ++ resources/views/admin/eggs/new.blade.php | 13 +++++++++++++ resources/views/admin/eggs/view.blade.php | 16 ++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/app/Http/Requests/Admin/Egg/EggFormRequest.php b/app/Http/Requests/Admin/Egg/EggFormRequest.php index a53b9c91b..561ffb797 100644 --- a/app/Http/Requests/Admin/Egg/EggFormRequest.php +++ b/app/Http/Requests/Admin/Egg/EggFormRequest.php @@ -14,6 +14,7 @@ class EggFormRequest extends AdminFormRequest 'docker_images' => ['required', 'string', 'regex:/^[\w#\.\/\- ]*\|?~?[\w\.\/\-:@ ]*$/im'], 'force_outgoing_ip' => 'sometimes|boolean', 'file_denylist' => 'array', + 'features' => 'sometimes|array', 'startup' => 'required|string', 'config_from' => 'sometimes|bail|nullable|numeric', 'config_stop' => 'required_without:config_from|nullable|string|max:191', @@ -42,6 +43,7 @@ class EggFormRequest extends AdminFormRequest return array_merge($data, [ 'force_outgoing_ip' => array_get($data, 'force_outgoing_ip', false), + 'features' => array_get($data, 'features', []), ]); } } diff --git a/resources/views/admin/eggs/new.blade.php b/resources/views/admin/eggs/new.blade.php index 9a0a07849..7f77fec9a 100644 --- a/resources/views/admin/eggs/new.blade.php +++ b/resources/views/admin/eggs/new.blade.php @@ -72,6 +72,14 @@

The default startup command that should be used for new servers created with this Egg. You can change this per-server as needed.

+
+ +
+ +

Additional features belonging to the egg. Useful for configuring additional panel modifications.

+
+
@@ -161,5 +169,10 @@ $(this).val(prepend + ' ' + append); } }); + $('#pConfigFeatures').select2({ + tags: true, + selectOnClose: false, + tokenSeparators: [',', ' '], + }); @endsection diff --git a/resources/views/admin/eggs/view.blade.php b/resources/views/admin/eggs/view.blade.php index b999d2a91..50b69c379 100644 --- a/resources/views/admin/eggs/view.blade.php +++ b/resources/views/admin/eggs/view.blade.php @@ -114,6 +114,17 @@

The default startup command that should be used for new servers using this Egg.

+
+ +
+ +

Additional features belonging to the egg. Useful for configuring additional panel modifications.

+
+
@@ -202,5 +213,10 @@ $(this).val(prepend + ' ' + append); } }); + $('#pConfigFeatures').select2({ + tags: true, + selectOnClose: false, + tokenSeparators: [',', ' '], + }); @endsection