dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Send the correct information to daemon for new index.js setup

Browse Source
This commit is contained in:
Dane Everitt 2017-03-12 16:04:47 -04:00
parent 419031e0cd
commit b1b1f448e9
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Daemon/ServiceController.php
View File

@ -24,7 +24,6 @@
namespace Pterodactyl\Http\Controllers\Daemon; namespace Pterodactyl\Http\Controllers\Daemon;
use Storage;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Pterodactyl\Models\Service; use Pterodactyl\Models\Service;
use Pterodactyl\Models\ServiceOption; use Pterodactyl\Models\ServiceOption;
@ -46,7 +45,7 @@ class ServiceController extends Controller
foreach (Service::all() as $service) { foreach (Service::all() as $service) {
$response[$service->folder] = [ $response[$service->folder] = [
'main.json' => sha1($this->getConfiguration($service->id)->toJson()), 'main.json' => sha1($this->getConfiguration($service->id)->toJson()),
'index.js' => sha1_file(storage_path('app/services/' . $service->folder . '/index.js')), 'index.js' => sha1($service->index_file),
]; ];
} }
@ -66,7 +65,7 @@ class ServiceController extends Controller
$service = Service::where('folder', $folder)->firstOrFail(); $service = Service::where('folder', $folder)->firstOrFail();
if ($file === 'index.js') { if ($file === 'index.js') {
return response()->file(storage_path('app/services/' . $service->folder . '/index.js')); return response($service->index_file)->header('Content-Type', 'text/plain');
} else if ($file === 'main.json') { } else if ($file === 'main.json') {
return response()->json($this->getConfiguration($service->id)); return response()->json($this->getConfiguration($service->id));
} }