StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added admin configuration

Browse source 
This is not working just yet but the fields have been added to the admin control area.
This commit is contained in:
Caleb 2020-09-28 16:14:14 -04:00
parent da30977364
commit d80660f047
5 changed files with 85 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
use Illuminate\Contracts\Config\Repository;
use Pterodactyl\Models\Server;
use Illuminate\Http\JsonResponse;
use Pterodactyl\Models\Allocation;
@ -16,7 +17,6 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Network\UpdateAllocationRequest
use Pterodactyl\Http\Requests\Api\Client\Servers\Network\NewAllocationRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Network\SetPrimaryAllocationRequest;
use Pterodactyl\Services\Allocations\AssignmentService;
use Illuminate\Support\Facades\Log;
class NetworkAllocationController extends ClientApiController
{
@ -41,17 +41,27 @@ class NetworkAllocationController extends ClientApiController
* @param \Pterodactyl\Repositories\Eloquent\AllocationRepository $repository
* @param \Pterodactyl\Repositories\Eloquent\ServerRepository $serverRepository
* @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService
* @param \Illuminate\Contracts\Config\Repository $config
*/
/**
* @var \Illuminate\Contracts\Config\Repository
*/
private $config;
public function __construct(
AllocationRepository $repository,
ServerRepository $serverRepository,
AssignmentService $assignmentService
AssignmentService $assignmentService,
Repository $config
) {
parent::__construct();
$this->repository = $repository;
$this->serverRepository = $serverRepository;
$this->assignmentService = $assignmentService;
$this->config = $config;
}
/**
@ -126,8 +136,10 @@ class NetworkAllocationController extends ClientApiController
public function addNew(NewAllocationRequest $request, Server $server): array
{
Log::info('addNew()');
$topRange = 25700;
$bottomRange = 25565;
$topRange = config('pterodactyl.allocation.start');
$bottomRange = config('pterodactyl.allocation.stop');
Log::error($bottomRange);
Log::error($topRange);
if($server->allocation_limit <= $server->allocations->count()) {
Log::error('You have created the maximum number of allocations!');
@ -139,7 +151,7 @@ class NetworkAllocationController extends ClientApiController
$allocation = $server->node->allocations()->where('ip',$server->allocation->ip)->whereNull('server_id')->first();
if(!$allocation) {
if($server->node->allocations()->where('ip',$server->allocation->ip)->count() >= $topRange-$bottomRange) {
if($server->node->allocations()->where('ip',$server->allocation->ip)->where([['port', '>=', $bottomRange ], ['port', '<=', $topRange],])->count() >= $topRange-$bottomRange || config('pterodactyl.allocation.enabled', 0)) {
Log::error('No allocations available!');
throw new DisplayException(
'No more allocations available!'

6
app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php
View file

@ -21,6 +21,9 @@ class AdvancedSettingsFormRequest extends AdminFormRequest
'pterodactyl:guzzle:connect_timeout' => 'required|integer|between:1,60',
'pterodactyl:console:count' => 'required|integer|min:1',
'pterodactyl:console:frequency' => 'required|integer|min:10',
'allocation:enabled' => 'required|in:true,false',
'pterodactyl:allocation:start' => 'required|integer|between:2000,65535',
'pterodactyl:allocation:stop' => 'required|integer|between:2000,65535',
];
}
@ -37,6 +40,9 @@ class AdvancedSettingsFormRequest extends AdminFormRequest
'pterodactyl:guzzle:connect_timeout' => 'HTTP Connection Timeout',
'pterodactyl:console:count' => 'Console Message Count',
'pterodactyl:console:frequency' => 'Console Frequency Tick',
'allocation:enabled' => 'Auto Create Allocations Enabled',
'pterodactyl:allocation:start' => 'Starting Port',
'pterodactyl:allocation:stop' => 'Ending Port',
];
}
}