MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into enhancement/wings-improved-server-loading

Browse Source
This commit is contained in:
Matthew Penner
2020-04-10 16:23:46 -06:00
committed by GitHub
parent 87e95f4195 7557dddf49
commit 94d46affb8
57 changed files with 602 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php
View File

@@ -145,7 +145,7 @@ class ServerTransferController extends Controller
->canOnlyBeUsedAfter($now->getTimestamp())
->expiresAt($now->addMinutes(15)->getTimestamp())
->relatedTo($server->uuid, true)
->getToken($signer, new Key($server->node->daemonSecret));
->getToken($signer, new Key($server->node->getDecryptedKey()));
// On the daemon transfer repository, make sure to set the node after the server
// because setServer() tells the repository to use the server's node and not the one