banquise/pelican-panel-banquise
13
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Issues 1 Pull Requests Actions Activity

Update file contents

Browse Source
This commit is contained in:
Dane Everitt 2021-01-23 13:59:52 -08:00
parent b480a9e4e2
commit 07798b7366
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Services/Servers/ServerConfigurationStructureService.php
View File

@ -7,15 +7,10 @@ use Pterodactyl\Models\Server;
class ServerConfigurationStructureService class ServerConfigurationStructureService
{ {
/** private EnvironmentService $environment;
* @var \Pterodactyl\Services\Servers\EnvironmentService
*/
private $environment;
/** /**
* ServerConfigurationStructureService constructor. * ServerConfigurationStructureService constructor.
*
* @param \Pterodactyl\Services\Servers\EnvironmentService $environment
*/ */
public function __construct(EnvironmentService $environment) public function __construct(EnvironmentService $environment)
{ {
@ -27,8 +22,6 @@ class ServerConfigurationStructureService
* *
* DO NOT MODIFY THIS FUNCTION. This powers legacy code handling for the new Wings * DO NOT MODIFY THIS FUNCTION. This powers legacy code handling for the new Wings
* daemon, if you modify the structure eggs will break unexpectedly. * daemon, if you modify the structure eggs will break unexpectedly.
*
* @param bool $legacy deprecated
*/ */
public function handle(Server $server, array $override = [], bool $legacy = false): array public function handle(Server $server, array $override = [], bool $legacy = false): array
{ {
@ -49,10 +42,8 @@ class ServerConfigurationStructureService
/** /**
* Returns the new data format used for the Wings daemon. * Returns the new data format used for the Wings daemon.
*
* @return array
*/ */
protected function returnCurrentFormat(Server $server) protected function returnCurrentFormat(Server $server): array
{ {
return [ return [
'uuid' => $server->uuid, 'uuid' => $server->uuid,
@ -89,11 +80,7 @@ class ServerConfigurationStructureService
}), }),
'egg' => [ 'egg' => [
'id' => $server->egg->uuid, 'id' => $server->egg->uuid,
'file_denylist' => [ 'file_denylist' => explode(PHP_EOL, $server->egg->inherit_file_denylist),
'config.yml',
'**/*.json',
],
// 'file_denylist' => explode(PHP_EOL, $server->egg->inherit_file_denylist),
], ],
]; ];
} }
@ -102,11 +89,9 @@ class ServerConfigurationStructureService
* Returns the legacy server data format to continue support for old egg configurations * Returns the legacy server data format to continue support for old egg configurations
* that have not yet been updated. * that have not yet been updated.
* *
* @return array
*
* @deprecated * @deprecated
*/ */
protected function returnLegacyFormat(Server $server) protected function returnLegacyFormat(Server $server): array
{ {
return [ return [
'uuid' => $server->uuid, 'uuid' => $server->uuid,