StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add skip scripting option

Browse source
This commit is contained in:
Dane Everitt 2017-04-20 17:57:40 -04:00
parent c8f1335a09
commit 3fe5d162f5
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Daemon/OptionController.php
View file

@ -41,8 +41,7 @@ class OptionController extends Controller
return response()->json([
'scripts' => [
'install' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_install),
// 'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
'install' => (! $server->option->script_install) ? null : str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_install),
'privileged' => $server->option->script_is_privileged,
],
'env' => $environment->merge([

2
app/Repositories/ServerRepository.php
View file

@ -103,6 +103,7 @@ class ServerRepository
'startup' => 'string',
'auto_deploy' => 'sometimes|required|accepted',
'custom_id' => 'sometimes|required|numeric|unique:servers,id',
'skip_scripting' => 'sometimes|required|boolean',
]);
$validator->sometimes('node_id', 'required|numeric|min:1|exists:nodes,id', function ($input) {
@ -326,6 +327,7 @@ class ServerRepository
'type' => $service->folder,
'option' => $option->tag,
'pack' => (isset($pack)) ? $pack->uuid : null,
'skip_scripting' => isset($data['skip_scripting']),
],
'keys' => [
(string) $server->daemonSecret => $this->daemonPermissions,