Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2020-04-17 10:21:20 -07:00
commit 0a20c6b857
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/Nodes/NodeCreationService.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Services\Nodes; namespace Pterodactyl\Services\Nodes;
use Ramsey\Uuid\Uuid;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Pterodactyl\Models\Node; use Pterodactyl\Models\Node;
use Illuminate\Encryption\Encrypter; use Illuminate\Encryption\Encrypter;
@ -41,6 +42,7 @@ class NodeCreationService
*/ */
public function handle(array $data) public function handle(array $data)
{ {
$data['uuid'] = Uuid::uuid4()->toString();
$data['daemon_token'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH)); $data['daemon_token'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH));
$data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH); $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);

4
resources/scripts/components/server/ServerConsole.tsx
View file

@ -110,7 +110,7 @@ export default () => {
className={'mr-1'} className={'mr-1'}
/> />
 {bytesToHuman(memory)}  {bytesToHuman(memory)}
<span className={'text-neutral-500'}>/ {server.limits.memory} MB</span> <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>
</p> </p>
<p className={'text-xs mt-2'}> <p className={'text-xs mt-2'}>
<FontAwesomeIcon <FontAwesomeIcon
@ -119,7 +119,7 @@ export default () => {
className={'mr-1'} className={'mr-1'}
/> />
&nbsp;{bytesToHuman(disk)} &nbsp;{bytesToHuman(disk)}
<span className={'text-neutral-500'}>/ {server.limits.disk} MB</span> <span className={'text-neutral-500'}> / {server.limits.disk} MB</span>
</p> </p>
</TitledGreyBox> </TitledGreyBox>
<Can action={[ 'control.start', 'control.stop', 'control.restart' ]} matchAny={true}> <Can action={[ 'control.start', 'control.stop', 'control.restart' ]} matchAny={true}>