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

Fix rebuild to pass things that are needed.

Browse source
This commit is contained in:
Dane Everitt 2017-03-18 19:03:05 -04:00
parent 891fd13911
commit 6ee878080b
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Console/Commands/RebuildServer.php
View file

@ -65,11 +65,11 @@ class RebuildServer extends Command
public function handle() public function handle()
{ {
if ($this->option('all')) { if ($this->option('all')) {
$servers = Server::with('node')->get(); $servers = Server::with('node', 'option.variables')->get();
} elseif ($this->option('node')) { } elseif ($this->option('node')) {
$servers = Server::with('node')->where('node_id', $this->option('node'))->get(); $servers = Server::with('node', 'option.variables')->where('node_id', $this->option('node'))->get();
} elseif ($this->option('server')) { } elseif ($this->option('server')) {
$servers = Server::with('node')->where('id', $this->option('server'))->get(); $servers = Server::with('node', 'option.variables')->where('id', $this->option('server'))->get();
} else { } else {
$this->error('You must pass a flag to determine which server(s) to rebuild.'); $this->error('You must pass a flag to determine which server(s) to rebuild.');
return; return;
@ -80,10 +80,26 @@ class RebuildServer extends Command
$results = collect([]); $results = collect([]);
foreach($servers as $server) { foreach($servers as $server) {
try { try {
$environment = $server->option->variables->map(function ($item, $key) use ($server) {
$display = $server->variables->where('variable_id', $item->id)->pluck('variable_value')->first();
return [
'variable' => $item->env_variable,
'value' => (! is_null($display)) ? $display : $item->default_value,
];
});
$server->node->guzzleClient([ $server->node->guzzleClient([
'X-Access-Server' => $server->uuid, 'X-Access-Server' => $server->uuid,
'X-Access-Token' => $server->node->daemonSecret, 'X-Access-Token' => $server->node->daemonSecret,
])->request('POST', '/server/rebuild'); ])->request('PATCH', '/server', [
'json' => [
'build' => [
'image' => $server->image,
'env|overwrite' => $environment->pluck('value', 'variable')->merge(['STARTUP' => $server->startup]),
],
],
]);
$results = $results->merge([ $results = $results->merge([
$server->uuid => [ $server->uuid => [