Push changes that support creations of service packs and basic listing
This commit is contained in:
parent
1f47eda3b3
commit
a1bc6fa2d3
15 changed files with 654 additions and 49 deletions
108
app/Http/Controllers/Admin/PackController.php
Normal file
108
app/Http/Controllers/Admin/PackController.php
Normal file
|
@ -0,0 +1,108 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
namespace Pterodactyl\Http\Controllers\Admin;
|
||||||
|
|
||||||
|
use Alert;
|
||||||
|
use Log;
|
||||||
|
use Storage;
|
||||||
|
|
||||||
|
use Pterodactyl\Models;
|
||||||
|
use Pterodactyl\Repositories\ServiceRepository\Pack;
|
||||||
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
|
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class PackController extends Controller
|
||||||
|
{
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
public function list(Request $request, $id)
|
||||||
|
{
|
||||||
|
$option = Models\ServiceOptions::findOrFail($id);
|
||||||
|
return view('admin.services.packs.index', [
|
||||||
|
'packs' => Models\ServicePack::where('option', $option->id)->get(),
|
||||||
|
'service' => Models\Service::findOrFail($option->parent_service),
|
||||||
|
'option' => $option
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function new(Request $request, $opt = null)
|
||||||
|
{
|
||||||
|
$options = Models\ServiceOptions::select(
|
||||||
|
'services.name AS p_service',
|
||||||
|
'service_options.id',
|
||||||
|
'service_options.name'
|
||||||
|
)->join('services', 'services.id', '=', 'service_options.parent_service')->get();
|
||||||
|
|
||||||
|
$array = [];
|
||||||
|
foreach($options as &$option) {
|
||||||
|
if (!array_key_exists($option->p_service, $array)) {
|
||||||
|
$array[$option->p_service] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$array[$option->p_service] = array_merge($array[$option->p_service], [[
|
||||||
|
'id' => $option->id,
|
||||||
|
'name' => $option->name
|
||||||
|
]]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return view('admin.services.packs.new', [
|
||||||
|
'services' => $array,
|
||||||
|
'packFor' => $opt,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function create(Request $request)
|
||||||
|
{
|
||||||
|
// dd($request->all());
|
||||||
|
try {
|
||||||
|
$repo = new Pack;
|
||||||
|
$id = $repo->create($request->except([
|
||||||
|
'_token'
|
||||||
|
]));
|
||||||
|
Alert::success('Successfully created new service!')->flash();
|
||||||
|
return redirect()->route('admin.services.packs.edit', $id)->withInput();
|
||||||
|
} catch (DisplayValidationException $ex) {
|
||||||
|
return redirect()->route('admin.services.packs.new', $request->input('option'))->withErrors(json_decode($ex->getMessage()))->withInput();
|
||||||
|
} catch (DisplayException $ex) {
|
||||||
|
Alert::danger($ex->getMessage())->flash();
|
||||||
|
} catch (\Exception $ex) {
|
||||||
|
Log::error($ex);
|
||||||
|
Alert::danger('An error occured while attempting to add a new service pack.')->flash();
|
||||||
|
}
|
||||||
|
return redirect()->route('admin.services.packs.new', $request->input('option'))->withInput();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function edit(Request $request, $id)
|
||||||
|
{
|
||||||
|
$pack = Models\ServicePack::findOrFail($id);
|
||||||
|
dd($pack, Storage::url('packs/' . $pack->uuid));
|
||||||
|
}
|
||||||
|
}
|
|
@ -430,6 +430,32 @@ class AdminRoutes {
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Service Packs
|
||||||
|
$router->group([
|
||||||
|
'prefix' => 'admin/services/packs',
|
||||||
|
'middleware' => [
|
||||||
|
'auth',
|
||||||
|
'admin',
|
||||||
|
'csrf'
|
||||||
|
]
|
||||||
|
], function () use ($router) {
|
||||||
|
$router->get('/new/{option?}', [
|
||||||
|
'as' => 'admin.services.packs.new',
|
||||||
|
'uses' => 'Admin\PackController@new'
|
||||||
|
]);
|
||||||
|
$router->post('/new', [
|
||||||
|
'uses' => 'Admin\PackController@create'
|
||||||
|
]);
|
||||||
|
$router->get('/for/{option}', [
|
||||||
|
'as' => 'admin.services.packs.for',
|
||||||
|
'uses' => 'Admin\PackController@list'
|
||||||
|
]);
|
||||||
|
$router->get('/edit/{pack}', [
|
||||||
|
'as' => 'admin.services.packs.edit',
|
||||||
|
'uses' => 'Admin\PackController@edit'
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
60
app/Models/ServicePack.php
Normal file
60
app/Models/ServicePack.php
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
namespace Pterodactyl\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class ServicePack extends Model
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The table associated with the model.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $table = 'service_packs';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fields that are not mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $guarded = ['id', 'created_at', 'updated_at'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cast values to correct type.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $casts = [
|
||||||
|
'option' => 'integer',
|
||||||
|
'build_memory' => 'integer',
|
||||||
|
'build_swap' => 'integer',
|
||||||
|
'build_cpu' => 'integer',
|
||||||
|
'build_io' => 'integer',
|
||||||
|
'selectable' => 'boolean',
|
||||||
|
'visible' => 'boolean'
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
105
app/Repositories/ServiceRepository/Pack.php
Normal file
105
app/Repositories/ServiceRepository/Pack.php
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
namespace Pterodactyl\Repositories\ServiceRepository;
|
||||||
|
|
||||||
|
use DB;
|
||||||
|
use Storage;
|
||||||
|
use Uuid;
|
||||||
|
use Validator;
|
||||||
|
|
||||||
|
use Pterodactyl\Models;
|
||||||
|
use Pterodactyl\Services\UuidService;
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||||
|
|
||||||
|
class Pack
|
||||||
|
{
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
public function create(array $data)
|
||||||
|
{
|
||||||
|
$validator = Validator::make($data, [
|
||||||
|
'name' => 'required|string',
|
||||||
|
'version' => 'required|string',
|
||||||
|
'description' => 'string',
|
||||||
|
'option' => 'required|exists:service_options,id',
|
||||||
|
'selectable' => 'sometimes|boolean',
|
||||||
|
'visible' => 'sometimes|boolean',
|
||||||
|
'build_memory' => 'required|integer|min:0',
|
||||||
|
'build_swap' => 'required|integer|min:0',
|
||||||
|
'build_cpu' => 'required|integer|min:0',
|
||||||
|
'build_io' => 'required|integer|min:10|max:1000',
|
||||||
|
'build_container' => 'required|string',
|
||||||
|
'build_script' => 'sometimes|string'
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($validator->fails()) {
|
||||||
|
throw new DisplayValidationException($validator->errors());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($data['file_upload'])) {
|
||||||
|
if (!$data['file_upload']->isValid()) {
|
||||||
|
throw new DisplayException('The file provided does not appear to be valid.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!in_array($data['file_upload']->getMimeType(), [
|
||||||
|
'application/zip',
|
||||||
|
'application/gzip'
|
||||||
|
])) {
|
||||||
|
throw new DisplayException('The file provided does not meet the required filetypes of application/zip or application/gzip.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::transaction(function () use ($data) {
|
||||||
|
$uuid = new UuidService;
|
||||||
|
$pack = Models\ServicePack::create([
|
||||||
|
'option' => $data['option'],
|
||||||
|
'uuid' => $uuid->generate('servers', 'uuid'),
|
||||||
|
'build_memory' => $data['build_memory'],
|
||||||
|
'build_swap' => $data['build_swap'],
|
||||||
|
'build_cpu' => $data['build_swap'],
|
||||||
|
'build_io' => $data['build_io'],
|
||||||
|
'build_script' => (empty($data['build_script'])) ? null : $data['build_script'],
|
||||||
|
'build_container' => $data['build_container'],
|
||||||
|
'name' => $data['name'],
|
||||||
|
'version' => $data['version'],
|
||||||
|
'description' => (empty($data['description'])) ? null : $data['description'],
|
||||||
|
'selectable' => isset($data['selectable']),
|
||||||
|
'visible' => isset($data['visible'])
|
||||||
|
]);
|
||||||
|
|
||||||
|
$filename = ($data['file_upload']->getMimeType() === 'application/zip') ? 'archive.zip' : 'archive.tar.gz';
|
||||||
|
$data['file_upload']->storeAs('packs/' . $pack->uuid, $filename);
|
||||||
|
|
||||||
|
$pack->save();
|
||||||
|
|
||||||
|
return $pack->id;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -101,6 +101,8 @@ class Service
|
||||||
|
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
try {
|
try {
|
||||||
|
Storage::deleteDirectory('services/' . $service->file);
|
||||||
|
|
||||||
Models\ServiceVariables::whereIn('option_id', $options->get()->toArray())->delete();
|
Models\ServiceVariables::whereIn('option_id', $options->get()->toArray())->delete();
|
||||||
$options->delete();
|
$options->delete();
|
||||||
$service->delete();
|
$service->delete();
|
||||||
|
@ -128,23 +130,10 @@ class Service
|
||||||
$filepath = 'services/' . $service->file . '/' . $filename;
|
$filepath = 'services/' . $service->file . '/' . $filename;
|
||||||
$backup = 'services/.bak/' . str_random(12) . '.bak';
|
$backup = 'services/.bak/' . str_random(12) . '.bak';
|
||||||
|
|
||||||
DB::beginTransaction();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Storage::move($filepath, $backup);
|
Storage::move($filepath, $backup);
|
||||||
Storage::put($filepath, $data['contents']);
|
Storage::put($filepath, $data['contents']);
|
||||||
|
|
||||||
$checksum = Models\Checksum::firstOrNew([
|
|
||||||
'service' => $service->id,
|
|
||||||
'filename' => $filename
|
|
||||||
]);
|
|
||||||
|
|
||||||
$checksum->checksum = sha1_file(storage_path('app/' . $filepath));
|
|
||||||
$checksum->save();
|
|
||||||
|
|
||||||
DB::commit();
|
|
||||||
} catch(\Exception $ex) {
|
} catch(\Exception $ex) {
|
||||||
DB::rollback();
|
|
||||||
Storage::move($backup, $filepath);
|
Storage::move($backup, $filepath);
|
||||||
throw $ex;
|
throw $ex;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
|
|
||||||
class AddChecksumsTable extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function up()
|
|
||||||
{
|
|
||||||
Schema::create('checksums', function (Blueprint $table) {
|
|
||||||
$table->increments('id');
|
|
||||||
$table->integer('service')->unsigned();
|
|
||||||
$table->string('filename');
|
|
||||||
$table->char('checksum', 40);
|
|
||||||
$table->timestamps();
|
|
||||||
|
|
||||||
$table->foreign('service')->references('id')->on('services');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function down()
|
|
||||||
{
|
|
||||||
Schema::drop('checksums');
|
|
||||||
}
|
|
||||||
}
|
|
46
database/migrations/2016_11_11_220649_add_pack_support.php
Normal file
46
database/migrations/2016_11_11_220649_add_pack_support.php
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class AddPackSupport extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::create('service_packs', function (Blueprint $table) {
|
||||||
|
$table->increments('id');
|
||||||
|
$table->unsignedInteger('option');
|
||||||
|
$table->char('uuid', 36)->unique();
|
||||||
|
$table->unsignedInteger('build_memory')->nullable();
|
||||||
|
$table->unsignedInteger('build_swap')->nullable();
|
||||||
|
$table->unsignedInteger('build_cpu')->nullable();
|
||||||
|
$table->unsignedInteger('build_io')->nullable();
|
||||||
|
$table->text('build_script')->nullable();
|
||||||
|
$table->string('build_container')->default('alpine:latest');
|
||||||
|
$table->string('name');
|
||||||
|
$table->string('version');
|
||||||
|
$table->text('description')->nullable();
|
||||||
|
$table->boolean('selectable')->default(true);
|
||||||
|
$table->boolean('visible')->default(true);
|
||||||
|
$table->timestamps();
|
||||||
|
|
||||||
|
$table->foreign('option')->references('id')->on('service_options');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::drop('service_packs');
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class SetServiceNameUnique extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('services', function (Blueprint $table) {
|
||||||
|
$table->unique('name');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('services', function (Blueprint $table) {
|
||||||
|
$table->dropUnique('services_name_unique');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -307,3 +307,14 @@ td.has-progress {
|
||||||
padding:0;
|
padding:0;
|
||||||
border:0;
|
border:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fuelux .checkbox-formheight.checkbox-custom.checkbox-inline.highlight {
|
||||||
|
height: 36px;
|
||||||
|
padding: 10px 8px 4px 28px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fuelux .checkbox-formheight.checkbox-custom.checkbox-inline.highlight:before {
|
||||||
|
left: 8px;
|
||||||
|
top: 11px;
|
||||||
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
<li><a href="/admin/services">Services</a></li>
|
<li><a href="/admin/services">Services</a></li>
|
||||||
<li><a href="{{ route('admin.services.service', $service->id) }}">{{ $service->name }}</a></li>
|
<li><a href="{{ route('admin.services.service', $service->id) }}">{{ $service->name }}</a></li>
|
||||||
<li class="active">{{ $option->name }}</li>
|
<li class="active">{{ $option->name }}</li>
|
||||||
|
<li><a href="{{ route('admin.services.packs.for', $option->id) }}">Service Packs</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="alert alert-warning"><strong>Warning!</strong> This page contains advanced settings that the panel and daemon use to control servers. Modifying information on this page is not recommended unless you are absolutely sure of what you are doing.</div>
|
<div class="alert alert-warning"><strong>Warning!</strong> This page contains advanced settings that the panel and daemon use to control servers. Modifying information on this page is not recommended unless you are absolutely sure of what you are doing.</div>
|
||||||
<h3>Settings</h3><hr />
|
<h3>Settings</h3><hr />
|
||||||
|
|
0
resources/views/admin/services/packs/edit.blade.php
Normal file
0
resources/views/admin/services/packs/edit.blade.php
Normal file
69
resources/views/admin/services/packs/index.blade.php
Normal file
69
resources/views/admin/services/packs/index.blade.php
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
{{-- Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com> --}}
|
||||||
|
|
||||||
|
{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}}
|
||||||
|
{{-- of this software and associated documentation files (the "Software"), to deal --}}
|
||||||
|
{{-- in the Software without restriction, including without limitation the rights --}}
|
||||||
|
{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}}
|
||||||
|
{{-- copies of the Software, and to permit persons to whom the Software is --}}
|
||||||
|
{{-- furnished to do so, subject to the following conditions: --}}
|
||||||
|
|
||||||
|
{{-- The above copyright notice and this permission notice shall be included in all --}}
|
||||||
|
{{-- copies or substantial portions of the Software. --}}
|
||||||
|
|
||||||
|
{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}}
|
||||||
|
{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}}
|
||||||
|
{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}}
|
||||||
|
{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}}
|
||||||
|
{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}}
|
||||||
|
{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}}
|
||||||
|
{{-- SOFTWARE. --}}
|
||||||
|
@extends('layouts.admin')
|
||||||
|
|
||||||
|
@section('title')
|
||||||
|
Service Packs for {{ $option->name }}
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
<div class="col-md-12">
|
||||||
|
<ul class="breadcrumb">
|
||||||
|
<li><a href="/admin">Admin Control</a></li>
|
||||||
|
<li><a href="/admin/services">Services</a></li>
|
||||||
|
<li><a href="{{ route('admin.services.service', $service->id) }}">{{ $service->name }}</a></li>
|
||||||
|
<li><a href="{{ route('admin.services.option', [$service->id, $option->id]) }}">{{ $option->name }}</a></li>
|
||||||
|
<li class="active">Service Packs</li>
|
||||||
|
</ul>
|
||||||
|
<h3 class="nopad">Service Packs</h3><hr />
|
||||||
|
<table class="table table-bordered table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Name</th>
|
||||||
|
<th>Version</th>
|
||||||
|
<th>UUID</th>
|
||||||
|
<th>Selectable</th>
|
||||||
|
<th>Visible</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach ($packs as $pack)
|
||||||
|
<tr>
|
||||||
|
<td>{{ $pack->name }}</td>
|
||||||
|
<td>{{ $pack->version }}</td>
|
||||||
|
<td><code>{{ $pack->uuid }}</code></td>
|
||||||
|
<td>@if($pack->selectable)<span class="label label-success"><i class="fa fa-check"></i></span>@else<span class="label label-default"><i class="fa fa-times"></i></span>@endif</td>
|
||||||
|
<td>@if($pack->visible)<span class="label label-success"><i class="fa fa-check"></i></span>@else<span class="label label-default"><i class="fa fa-times"></i></span>@endif</td>
|
||||||
|
</tr>
|
||||||
|
@endforeach
|
||||||
|
<tr>
|
||||||
|
<td colspan="5">
|
||||||
|
<a href="{{ route('admin.services.packs.new', $option->id) }}">
|
||||||
|
<button class="pull-right btn btn-xxs btn-primary"><i class="fa fa-plus"></i></button>
|
||||||
|
</a>
|
||||||
|
<a href="{{ route('admin.services.packs.new', $option->id) }}">
|
||||||
|
<button class="pull-right btn btn-xxs btn-default" style="margin-right:5px;"><i class="fa fa-upload"></i> Install from Template</button>
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
@endsection
|
192
resources/views/admin/services/packs/new.blade.php
Normal file
192
resources/views/admin/services/packs/new.blade.php
Normal file
|
@ -0,0 +1,192 @@
|
||||||
|
{{-- Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com> --}}
|
||||||
|
|
||||||
|
{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}}
|
||||||
|
{{-- of this software and associated documentation files (the "Software"), to deal --}}
|
||||||
|
{{-- in the Software without restriction, including without limitation the rights --}}
|
||||||
|
{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}}
|
||||||
|
{{-- copies of the Software, and to permit persons to whom the Software is --}}
|
||||||
|
{{-- furnished to do so, subject to the following conditions: --}}
|
||||||
|
|
||||||
|
{{-- The above copyright notice and this permission notice shall be included in all --}}
|
||||||
|
{{-- copies or substantial portions of the Software. --}}
|
||||||
|
|
||||||
|
{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}}
|
||||||
|
{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}}
|
||||||
|
{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}}
|
||||||
|
{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}}
|
||||||
|
{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}}
|
||||||
|
{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}}
|
||||||
|
{{-- SOFTWARE. --}}
|
||||||
|
@extends('layouts.admin')
|
||||||
|
|
||||||
|
@section('title')
|
||||||
|
Add New Service Pack
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
<div class="col-md-12">
|
||||||
|
<ul class="breadcrumb">
|
||||||
|
<li><a href="/admin">Admin Control</a></li>
|
||||||
|
<li><a href="/admin/services">Services</a></li>
|
||||||
|
<li class="active">New Service Pack</li>
|
||||||
|
</ul>
|
||||||
|
<h3 class="nopad">New Service Pack</h3><hr />
|
||||||
|
<form action="{{ route('admin.services.packs.new') }}" method="POST" enctype="multipart/form-data">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 form-group">
|
||||||
|
<label class="control-label">Pack Name:</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" name="name" value="{{ old('name') }}" placeholder="My Awesome Pack" class="form-control" />
|
||||||
|
<p class="text-muted"><small>The name of the pack which will be seen in dropdown menus and to users.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 form-group">
|
||||||
|
<label class="control-label">Pack Version:</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" name="version" value="{{ old('version') }}" placeholder="v0.8.1" class="form-control" />
|
||||||
|
<p class="text-muted"><small>The version of the program included in this pack.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-12 form-group">
|
||||||
|
<label class="control-label">Description:</label>
|
||||||
|
<div>
|
||||||
|
<textarea name="description" class="form-control" rows="3">{{ old('description') }}</textarea>
|
||||||
|
<p class="text-muted"><small>Provide a description of the pack which will be shown to users.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<label class="control-label">Associated Service Option:</label>
|
||||||
|
<select name="option" class="form-control">
|
||||||
|
@foreach($services as $service => $options)
|
||||||
|
<option disabled>{{ $service }}</option>
|
||||||
|
@foreach($options as $option)
|
||||||
|
<option value="{{ $option['id'] }}" @if((int) $packFor === (int) $option['id'])selected="selected"@endif> -- {{ $option['name'] }}</option>
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 fuelux">
|
||||||
|
<label class="control-label"> </label>
|
||||||
|
<div>
|
||||||
|
<label class="checkbox-formheight checkbox-custom checkbox-inline highlight" data-initialize="checkbox">
|
||||||
|
<input class="sr-only" type="checkbox" name="selectable" value="1"> User Selectable
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 fuelux">
|
||||||
|
<label class="control-label"> </label>
|
||||||
|
<div>
|
||||||
|
<label class="checkbox-formheight checkbox-custom checkbox-inline highlight" data-initialize="checkbox">
|
||||||
|
<input class="sr-only" type="checkbox" name="visible" value="1"> Visible
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<h5 class="nopad">Build Parameters</h5>
|
||||||
|
<div class="well" style="margin-bottom:0">
|
||||||
|
<div class="row">
|
||||||
|
<div class="form-group col-md-3 col-xs-6">
|
||||||
|
<label class="control-label">Memory:</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" name="build_memory" class="form-control" value="{{ old('build_memory', 0) }}"/>
|
||||||
|
<span class="input-group-addon">MB</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-3 col-xs-6">
|
||||||
|
<label class="control-label">Swap:</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" name="build_swap" class="form-control" value="{{ old('build_swap', 0) }}"/>
|
||||||
|
<span class="input-group-addon">MB</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-3 col-xs-6">
|
||||||
|
<label class="control-label">CPU:</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" name="build_cpu" class="form-control" value="{{ old('build_cpu', 0) }}"/>
|
||||||
|
<span class="input-group-addon">%</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-3 col-xs-6">
|
||||||
|
<label class="control-label">IO:</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" name="build_io" class="form-control" value="{{ old('build_io', 300) }}"/>
|
||||||
|
<span class="input-group-addon">I/O</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-12">
|
||||||
|
<div>
|
||||||
|
<p class="text-muted"><small>If you would like to set limits on the build container you may do so above. Setting <code>memory</code>, <code>swap</code>, or <code>cpu</code> to <code>0</code> will allow unlimited resource utilization. IO must be in a range between <code>10</code> to <code>1000</code> and is a relative weighting to other container IO usage.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="form-group col-md-12">
|
||||||
|
<label class="control-label">Build Container:</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" name="build_container" class="form-control" value="{{ old('build_container', 'alpine:latest') }}"/>
|
||||||
|
<p class="text-muted"><small>Provide the docker container image that will be used to build this service pack. This container is <em>only</em> used if a build script is provided below.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-12">
|
||||||
|
<label class="control-label">Build Script:</label>
|
||||||
|
<div id="build_script" style="height:200px"></div>
|
||||||
|
<textarea id="editor_contents" name="build_script" class="hidden"></textarea>
|
||||||
|
<p class="text-muted"><small>This script will be run inside the container if provided. You should use this script to download any additional dependencies or compile packages as necessary on the node. Your uploaded archive (if provided), will be available in <code>/input</code> as <code>archive.tar.gz</code> or as <code>archive.zip</code> depending on what format you uploaded as. Your completed pack should be saved as <code>package.tar.gz</code> in the <code>/output</code> directory (e.g. <code>/output/package.tar.gz</code>).</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<h5 class="nopad">File Upload</h5>
|
||||||
|
<div class="well" style="margin-bottom:0">
|
||||||
|
<div class="row">
|
||||||
|
<div class="form-group col-md-12">
|
||||||
|
<label class="control-label">Package Archive:</label>
|
||||||
|
<input name="file_upload" type="file" accept=".zip,.tar.gz, application/zip, application/gzip" />
|
||||||
|
<p class="text-muted"><small>This package file must either be a <code>.zip</code> or <code>.tar.gz</code> archive of files to use for either building or running this pack.<br /><br />If your file is larger than <code>20MB</code> we recommend uploading it using SFTP. Once you have added this pack to the system, a path will be provided where you should upload the file.
|
||||||
|
This is currently configured with the following limits: <code>upload_max_filesize={{ ini_get('upload_max_filesize') }}</code> and <code>post_max_size={{ ini_get('post_max_size') }}</code>. If your file is larger than either of those values this request will fail.</small></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="form-group">
|
||||||
|
{!! csrf_field() !!}
|
||||||
|
<input type="submit" class="btn btn-sm btn-primary" value="Add Service Pack" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{!! Theme::js('js/vendor/ace/ace.js') !!}
|
||||||
|
{!! Theme::js('js/vendor/ace/ext-modelist.js') !!}
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).ready(function () {
|
||||||
|
const Editor = ace.edit('build_script');
|
||||||
|
|
||||||
|
Editor.setTheme('ace/theme/chrome');
|
||||||
|
Editor.getSession().setUseWrapMode(true);
|
||||||
|
Editor.setShowPrintMargin(false);
|
||||||
|
Editor.getSession().setMode('ace/mode/sh');
|
||||||
|
Editor.setOptions({
|
||||||
|
minLines: 12,
|
||||||
|
maxLines: Infinity
|
||||||
|
});
|
||||||
|
|
||||||
|
Editor.setValue('{{ old('build_script') }}');
|
||||||
|
Editor.on('change', event => {
|
||||||
|
$('#editor_contents').val(Editor.getValue());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
@endsection
|
2
storage/app/.gitignore
vendored
2
storage/app/.gitignore
vendored
|
@ -1,4 +1,6 @@
|
||||||
*
|
*
|
||||||
!.gitignore
|
!.gitignore
|
||||||
!services/*
|
!services/*
|
||||||
|
packs/**/*
|
||||||
services/.bak/*
|
services/.bak/*
|
||||||
|
!packs/.githold
|
||||||
|
|
0
storage/app/packs/.githold
Normal file
0
storage/app/packs/.githold
Normal file
Loading…
Reference in a new issue