$docker_images
- * @property string $update_url
+ * @property string|null $update_url
* @property bool $force_outgoing_ip
* @property array|null $file_denylist
* @property string|null $config_files
@@ -95,6 +95,7 @@ class Egg extends Model
'config_stop',
'config_from',
'startup',
+ 'update_url',
'script_is_privileged',
'script_install',
'script_entry',
diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php
index ba9f9a40a..0b9dd9e32 100644
--- a/app/Models/EggVariable.php
+++ b/app/Models/EggVariable.php
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
* @property string $default_value
* @property bool $user_viewable
* @property bool $user_editable
- * @property string $rules
+ * @property array $rules
* @property \Carbon\CarbonImmutable $created_at
* @property \Carbon\CarbonImmutable $updated_at
* @property bool $required
@@ -58,12 +58,14 @@ class EggVariable extends Model
'default_value' => 'string',
'user_viewable' => 'boolean',
'user_editable' => 'boolean',
- 'rules' => 'string',
+ 'rules' => 'array',
+ 'rules.*' => 'string',
];
protected $attributes = [
'user_editable' => 0,
'user_viewable' => 0,
+ 'rules' => '[]',
];
protected function casts(): array
@@ -72,6 +74,7 @@ class EggVariable extends Model
'egg_id' => 'integer',
'user_viewable' => 'bool',
'user_editable' => 'bool',
+ 'rules' => 'array',
'created_at' => 'immutable_datetime',
'updated_at' => 'immutable_datetime',
];
@@ -79,7 +82,7 @@ class EggVariable extends Model
public function getRequiredAttribute(): bool
{
- return in_array('required', explode('|', $this->rules));
+ return in_array('required', $this->rules);
}
public function egg(): HasOne
diff --git a/app/Models/Node.php b/app/Models/Node.php
index 54014dfc8..377fc07ac 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -237,21 +237,21 @@ class Node extends Model
*/
public function isViable(int $memory, int $disk, int $cpu): bool
{
- if ($this->memory_overallocate >= 0) {
+ if ($this->memory > 0 && $this->memory_overallocate >= 0) {
$memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
if ($this->servers_sum_memory + $memory > $memoryLimit) {
return false;
}
}
- if ($this->disk_overallocate >= 0) {
+ if ($this->disk > 0 && $this->disk_overallocate >= 0) {
$diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
if ($this->servers_sum_disk + $disk > $diskLimit) {
return false;
}
}
- if ($this->cpu_overallocate >= 0) {
+ if ($this->cpu > 0 && $this->cpu_overallocate >= 0) {
$cpuLimit = $this->cpu * (1 + ($this->cpu_overallocate / 100));
if ($this->servers_sum_cpu + $cpu > $cpuLimit) {
return false;
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index d25bd1b5d..9efad2b08 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -24,62 +24,4 @@ class Setting extends Model
'key' => 'required|string|between:1,255',
'value' => 'string',
];
-
- private static array $cache = [];
-
- private static array $databaseMiss = [];
-
- /**
- * Store a new persistent setting in the database.
- */
- public static function set(string $key, string $value = null): void
- {
- // Clear item from the cache.
- self::clearCache($key);
-
- self::query()->updateOrCreate(['key' => $key], ['value' => $value ?? '']);
-
- self::$cache[$key] = $value;
- }
-
- /**
- * Retrieve a persistent setting from the database.
- */
- public static function get(string $key, mixed $default = null): mixed
- {
- // If item has already been requested return it from the cache. If
- // we already know it is missing, immediately return the default value.
- if (array_key_exists($key, self::$cache)) {
- return self::$cache[$key];
- } elseif (array_key_exists($key, self::$databaseMiss)) {
- return value($default);
- }
-
- $instance = self::query()->where('key', $key)->first();
- if (is_null($instance)) {
- self::$databaseMiss[$key] = true;
-
- return value($default);
- }
-
- return self::$cache[$key] = $instance->value;
- }
-
- /**
- * Remove a key from the database cache.
- */
- public static function forget(string $key)
- {
- self::clearCache($key);
-
- return self::query()->where('key', $key)->delete();
- }
-
- /**
- * Remove a key from the cache.
- */
- private static function clearCache(string $key): void
- {
- unset(self::$cache[$key], self::$databaseMiss[$key]);
- }
}
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 6545ab5f5..254d38ece 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -33,6 +33,7 @@ class Task extends Model
public const ACTION_POWER = 'power';
public const ACTION_COMMAND = 'command';
public const ACTION_BACKUP = 'backup';
+ public const ACTION_DELETE_FILES = 'delete_files';
/**
* The table associated with the model.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index fe734f1a3..4b4e53f74 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -11,6 +11,8 @@ use App\Services\Helpers\SoftwareVersionService;
use Dedoc\Scramble\Scramble;
use Dedoc\Scramble\Support\Generator\OpenApi;
use Dedoc\Scramble\Support\Generator\SecurityScheme;
+use Filament\Support\Colors\Color;
+use Filament\Support\Facades\FilamentColor;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Broadcast;
@@ -83,6 +85,15 @@ class AppServiceProvider extends ServiceProvider
Event::listen(function (\SocialiteProviders\Manager\SocialiteWasCalled $event) {
$event->extendSocialite('discord', \SocialiteProviders\Discord\Provider::class);
});
+
+ FilamentColor::register([
+ 'danger' => Color::Red,
+ 'gray' => Color::Zinc,
+ 'info' => Color::Sky,
+ 'primary' => Color::Blue,
+ 'success' => Color::Green,
+ 'warning' => Color::Amber,
+ ]);
}
/**
@@ -90,11 +101,6 @@ class AppServiceProvider extends ServiceProvider
*/
public function register(): void
{
- // Only load the settings service provider if the environment is configured to allow it.
- if (!config('panel.load_environment_only', false) && $this->app->environment() !== 'testing') {
- $this->app->register(SettingsServiceProvider::class);
- }
-
$this->app->singleton('extensions.themes', function () {
return new Theme();
});
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 88b8a3d01..e8b9a9a0d 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -10,7 +10,6 @@ use App\Observers\UserObserver;
use App\Observers\ServerObserver;
use App\Observers\SubuserObserver;
use App\Observers\EggVariableObserver;
-use App\Listeners\Auth\AuthenticationListener;
use App\Events\Server\Installed as ServerInstalledEvent;
use App\Notifications\ServerInstalled as ServerInstalledNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -24,10 +23,6 @@ class EventServiceProvider extends ServiceProvider
ServerInstalledEvent::class => [ServerInstalledNotification::class],
];
- protected $subscribe = [
- AuthenticationListener::class,
- ];
-
/**
* Register any events for your application.
*/
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 60339c744..8c8f6355e 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -9,7 +9,6 @@ use Filament\Http\Middleware\DisableBladeIconComponents;
use Filament\Http\Middleware\DispatchServingFilamentEvent;
use Filament\Panel;
use Filament\PanelProvider;
-use Filament\Support\Colors\Color;
use Filament\Support\Facades\FilamentAsset;
use Filament\Widgets;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
@@ -37,21 +36,13 @@ class AdminPanelProvider extends PanelProvider
->path('admin')
->topNavigation(config('panel.filament.top-navigation', true))
->login()
+ ->breadcrumbs(false)
->homeUrl('/')
->favicon(config('app.favicon', '/pelican.ico'))
->brandName(config('app.name', 'Pelican'))
->brandLogo(config('app.logo'))
->brandLogoHeight('2rem')
->profile(EditProfile::class, false)
- ->colors([
- 'danger' => Color::Red,
- 'gray' => Color::Zinc,
- 'info' => Color::Sky,
- 'primary' => Color::Blue,
- 'success' => Color::Green,
- 'warning' => Color::Amber,
- 'blurple' => Color::hex('#5865F2'),
- ])
->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
->discoverClusters(in: app_path('Filament/Clusters'), for: 'App\\Filament\\Clusters')
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
deleted file mode 100644
index 5c7412455..000000000
--- a/app/Providers/SettingsServiceProvider.php
+++ /dev/null
@@ -1,112 +0,0 @@
-keys = array_merge($this->keys, $this->emailKeys);
- }
-
- try {
- $values = Setting::all()->mapWithKeys(function ($setting) {
- return [$setting->key => $setting->value];
- })->toArray();
- } catch (QueryException $exception) {
- $log->notice('A query exception was encountered while trying to load settings from the database: ' . $exception->getMessage());
-
- return;
- }
-
- foreach ($this->keys as $key) {
- $value = array_get($values, 'settings::' . $key, config(str_replace(':', '.', $key)));
- if (in_array($key, self::$encrypted)) {
- try {
- $value = decrypt($value);
- } catch (Exception) {
- // ignore
- }
- }
-
- switch (strtolower($value)) {
- case 'true':
- case '(true)':
- $value = true;
- break;
- case 'false':
- case '(false)':
- $value = false;
- break;
- case 'empty':
- case '(empty)':
- $value = '';
- break;
- case 'null':
- case '(null)':
- $value = null;
- }
-
- config()->set(str_replace(':', '.', $key), $value);
- }
- }
-
- public static function getEncryptedKeys(): array
- {
- return self::$encrypted;
- }
-}
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index 1e85923d7..dc54525a6 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -54,6 +54,8 @@ class EggImporterService
// Update existing variables or create new ones.
foreach ($parsed['variables'] ?? [] as $variable) {
EggVariable::unguarded(function () use ($egg, $variable) {
+ $variable['rules'] = is_array($variable['rules']) ? $variable['rules'] : explode('|', $variable['rules']);
+
$egg->variables()->updateOrCreate([
'env_variable' => $variable['env_variable'],
], Collection::make($variable)->except(['egg_id', 'env_variable'])->toArray());
diff --git a/app/Services/Eggs/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php
index d2213f5be..c6c726986 100644
--- a/app/Services/Eggs/Variables/VariableCreationService.php
+++ b/app/Services/Eggs/Variables/VariableCreationService.php
@@ -40,7 +40,7 @@ class VariableCreationService
throw new ReservedVariableNameException(sprintf('Cannot use the protected name %s for this environment variable.', array_get($data, 'env_variable')));
}
- if (!empty($data['rules'] ?? '')) {
+ if (!empty($data['rules'] ?? [])) {
$this->validateRules($data['rules']);
}
@@ -55,7 +55,7 @@ class VariableCreationService
'default_value' => $data['default_value'] ?? '',
'user_viewable' => in_array('user_viewable', $options),
'user_editable' => in_array('user_editable', $options),
- 'rules' => $data['rules'] ?? '',
+ 'rules' => $data['rules'] ?? [],
]);
return $eggVariable;
diff --git a/app/Services/Eggs/Variables/VariableUpdateService.php b/app/Services/Eggs/Variables/VariableUpdateService.php
index 515cbc271..e56ae8ea7 100644
--- a/app/Services/Eggs/Variables/VariableUpdateService.php
+++ b/app/Services/Eggs/Variables/VariableUpdateService.php
@@ -2,7 +2,6 @@
namespace App\Services\Eggs\Variables;
-use Illuminate\Support\Str;
use App\Models\EggVariable;
use App\Exceptions\DisplayException;
use App\Traits\Services\ValidatesValidationRules;
@@ -54,12 +53,8 @@ class VariableUpdateService
}
}
- if (!empty($data['rules'] ?? '')) {
- $this->validateRules(
- (is_string($data['rules']) && Str::contains($data['rules'], ';;'))
- ? explode(';;', $data['rules'])
- : $data['rules']
- );
+ if (!empty($data['rules'] ?? [])) {
+ $this->validateRules($data['rules']);
}
$options = array_get($data, 'options') ?? [];
@@ -71,7 +66,7 @@ class VariableUpdateService
'default_value' => $data['default_value'] ?? '',
'user_viewable' => in_array('user_viewable', $options),
'user_editable' => in_array('user_editable', $options),
- 'rules' => $data['rules'] ?? '',
+ 'rules' => $data['rules'] ?? [],
]);
}
}
diff --git a/app/Services/Files/DeleteFilesService.php b/app/Services/Files/DeleteFilesService.php
new file mode 100644
index 000000000..2b1be5fda
--- /dev/null
+++ b/app/Services/Files/DeleteFilesService.php
@@ -0,0 +1,41 @@
+daemonFileRepository->setServer($server)->getDirectory($path))->each(function ($item) use ($path, $pattern, $filesToDelete) {
+ if (Str::is($pattern, $item['name'])) {
+ $filesToDelete->push($path . '/' . $item['name']);
+ }
+ });
+ }
+
+ if ($filesToDelete->isNotEmpty()) {
+ $this->daemonFileRepository->setServer($server)->deleteFiles('/', $filesToDelete->toArray());
+ }
+ }
+}
diff --git a/app/Services/Helpers/SoftwareVersionService.php b/app/Services/Helpers/SoftwareVersionService.php
index c66d85904..7d50203bf 100644
--- a/app/Services/Helpers/SoftwareVersionService.php
+++ b/app/Services/Helpers/SoftwareVersionService.php
@@ -4,7 +4,7 @@ namespace App\Services\Helpers;
use GuzzleHttp\Client;
use Carbon\CarbonImmutable;
-use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Support\Arr;
use Illuminate\Contracts\Cache\Repository as CacheRepository;
@@ -89,18 +89,28 @@ class SoftwareVersionService
$versionData = [];
try {
- $response = $this->client->request('GET', 'https://api.github.com/repos/pelican-dev/panel/releases/latest');
+ $response = $this->client->request('GET', 'https://api.github.com/repos/pelican-dev/panel/releases/latest',
+ [
+ 'timeout' => config('panel.guzzle.timeout'),
+ 'connect_timeout' => config('panel.guzzle.connect_timeout'),
+ ]
+ );
if ($response->getStatusCode() === 200) {
$panelData = json_decode($response->getBody(), true);
$versionData['panel'] = trim($panelData['tag_name'], 'v');
}
- $response = $this->client->request('GET', 'https://api.github.com/repos/pelican-dev/wings/releases/latest');
+ $response = $this->client->request('GET', 'https://api.github.com/repos/pelican-dev/wings/releases/latest',
+ [
+ 'timeout' => config('panel.guzzle.timeout'),
+ 'connect_timeout' => config('panel.guzzle.connect_timeout'),
+ ]
+ );
if ($response->getStatusCode() === 200) {
$wingsData = json_decode($response->getBody(), true);
$versionData['daemon'] = trim($wingsData['tag_name'], 'v');
}
- } catch (ClientException $e) {
+ } catch (GuzzleException $e) {
}
$versionData['discord'] = 'https://pelican.dev/discord';
diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php
index a8e761847..b004263f6 100644
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@@ -51,12 +51,12 @@ class ServerConfigurationStructureService
'invocation' => $server->startup,
'skip_egg_scripts' => $server->skip_scripts,
'build' => [
- 'memory_limit' => config('panel.use_binary_prefix') ? $server->memory : $server->memory / 1.048576,
- 'swap' => config('panel.use_binary_prefix') ? $server->swap : $server->swap / 1.048576,
+ 'memory_limit' => (int) round(config('panel.use_binary_prefix') ? $server->memory : $server->memory / 1.048576),
+ 'swap' => (int) round(config('panel.use_binary_prefix') ? $server->swap : $server->swap / 1.048576),
'io_weight' => $server->io,
'cpu_limit' => $server->cpu,
'threads' => $server->threads,
- 'disk_space' => config('panel.use_binary_prefix') ? $server->disk : $server->disk / 1.048576,
+ 'disk_space' => (int) round(config('panel.use_binary_prefix') ? $server->disk : $server->disk / 1.048576),
'oom_killer' => $server->oom_killer,
],
'container' => [
diff --git a/app/Traits/CheckMigrationsTrait.php b/app/Traits/CheckMigrationsTrait.php
new file mode 100644
index 000000000..ee2de8f3a
--- /dev/null
+++ b/app/Traits/CheckMigrationsTrait.php
@@ -0,0 +1,29 @@
+make('migrator');
+
+ $files = $migrator->getMigrationFiles(database_path('migrations'));
+
+ if (!$migrator->repositoryExists()) {
+ return false;
+ }
+
+ if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
+ return false;
+ }
+
+ return true;
+ }
+}
diff --git a/app/Traits/Commands/RequestRedisSettingsTrait.php b/app/Traits/Commands/RequestRedisSettingsTrait.php
new file mode 100644
index 000000000..07ef229c2
--- /dev/null
+++ b/app/Traits/Commands/RequestRedisSettingsTrait.php
@@ -0,0 +1,52 @@
+output->note(__('commands.appsettings.redis.note'));
+ $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
+ 'Redis Host',
+ config('database.redis.default.host')
+ );
+
+ $askForRedisUser = true;
+ $askForRedisPassword = true;
+
+ if (!empty(config('database.redis.default.user'))) {
+ $this->variables['REDIS_USERNAME'] = config('database.redis.default.user');
+ $askForRedisUser = $this->confirm(__('commands.appsettings.redis.confirm', ['field' => 'user']));
+ }
+ if (!empty(config('database.redis.default.password'))) {
+ $this->variables['REDIS_PASSWORD'] = config('database.redis.default.password');
+ $askForRedisPassword = $this->confirm(__('commands.appsettings.redis.confirm', ['field' => 'password']));
+ }
+
+ if ($askForRedisUser) {
+ $this->output->comment(__('commands.appsettings.redis.comment'));
+ $this->variables['REDIS_USERNAME'] = $this->option('redis-user') ?? $this->output->askHidden(
+ 'Redis User'
+ );
+ }
+ if ($askForRedisPassword) {
+ $this->output->comment(__('commands.appsettings.redis.comment'));
+ $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
+ 'Redis Password'
+ );
+ }
+
+ if (empty($this->variables['REDIS_USERNAME'])) {
+ $this->variables['REDIS_USERNAME'] = 'null';
+ }
+ if (empty($this->variables['REDIS_PASSWORD'])) {
+ $this->variables['REDIS_PASSWORD'] = 'null';
+ }
+
+ $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
+ 'Redis Port',
+ config('database.redis.default.port')
+ );
+ }
+}
diff --git a/app/Console/RequiresDatabaseMigrations.php b/app/Traits/Commands/RequiresDatabaseMigrations.php
similarity index 63%
rename from app/Console/RequiresDatabaseMigrations.php
rename to app/Traits/Commands/RequiresDatabaseMigrations.php
index c6b71f1bd..67551a26a 100644
--- a/app/Console/RequiresDatabaseMigrations.php
+++ b/app/Traits/Commands/RequiresDatabaseMigrations.php
@@ -1,32 +1,16 @@
getLaravel()->make('migrator');
-
- $files = $migrator->getMigrationFiles(database_path('migrations'));
-
- if (!$migrator->repositoryExists()) {
- return false;
- }
-
- if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
- return false;
- }
-
- return true;
- }
+ use CheckMigrationsTrait;
/**
* Throw a massive error into the console to hopefully catch the users attention and get
diff --git a/app/Traits/Commands/EnvironmentWriterTrait.php b/app/Traits/EnvironmentWriterTrait.php
similarity index 88%
rename from app/Traits/Commands/EnvironmentWriterTrait.php
rename to app/Traits/EnvironmentWriterTrait.php
index eb40f8c8b..cd7fbdfe0 100644
--- a/app/Traits/Commands/EnvironmentWriterTrait.php
+++ b/app/Traits/EnvironmentWriterTrait.php
@@ -1,8 +1,8 @@
properties
->mapWithKeys(function ($value, $key) use ($model) {
- if ($key === 'ip' && !$model->actor->is($this->request->user())) {
+ if ($key === 'ip' && $model->actor instanceof User && !$model->actor->is($this->request->user())) {
return [$key => '[hidden]'];
}
diff --git a/app/Transformers/Api/Client/EggVariableTransformer.php b/app/Transformers/Api/Client/EggVariableTransformer.php
index bdc2fad15..141f43b61 100644
--- a/app/Transformers/Api/Client/EggVariableTransformer.php
+++ b/app/Transformers/Api/Client/EggVariableTransformer.php
@@ -27,7 +27,7 @@ class EggVariableTransformer extends BaseClientTransformer
'default_value' => $variable->default_value,
'server_value' => $variable->server_value,
'is_editable' => $variable->user_editable,
- 'rules' => $variable->rules,
+ 'rules' => implode('|', $variable->rules),
];
}
}
diff --git a/app/helpers.php b/app/helpers.php
index c2aa5cd74..4f3e87021 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -40,3 +40,11 @@ if (!function_exists('object_get_strict')) {
return $object;
}
}
+
+if (!function_exists('is_installed')) {
+ function is_installed(): bool
+ {
+ // This defaults to true so existing panels count as "installed"
+ return env('APP_INSTALLED', true);
+ }
+}
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index 8c37bb7b5..a20d8785c 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -8,6 +8,5 @@ return [
App\Providers\Filament\AdminPanelProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\ViewComposerServiceProvider::class,
-
SocialiteProviders\Manager\ServiceProvider::class,
];
diff --git a/config/app.php b/config/app.php
index e8d4deb30..1a89ba65f 100644
--- a/config/app.php
+++ b/config/app.php
@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Facade;
return [
'name' => env('APP_NAME', 'Pelican'),
+ 'favicon' => env('APP_FAVICON', '/pelican.ico'),
'version' => 'canary',
diff --git a/config/panel.php b/config/panel.php
index a8b73ad2e..e2d6eb416 100644
--- a/config/panel.php
+++ b/config/panel.php
@@ -1,18 +1,6 @@
(bool) env('APP_ENVIRONMENT_ONLY', false),
-
/*
|--------------------------------------------------------------------------
| Authentication
diff --git a/contributing.md b/contributing.md
new file mode 100644
index 000000000..5c9ee66c8
--- /dev/null
+++ b/contributing.md
@@ -0,0 +1,54 @@
+# Contributing
+
+Welcome to the Pelican project! We are excited to have you contribute to our open-source project. This guide will help you get started with setting up your development environment, understanding our coding standards, and making your first or next contribution.
+
+## Getting started
+
+To start contributing to Pelican Panel, you need to have a basic understanding of the following:
+
+* [PHP](https://php.net) & [Laravel](https://laravel.com)
+* [Livewire](https://laravel-livewire.com) & [Filament](https://filamentphp.com)
+* [Git](https://git-scm.com) & [Github](https://github.com)
+
+## Dev Environment Setup
+
+1. Fork the Repository
+2. Clone your Fork
+3. Install Dependencies (PHP modules & composer, and run `composer install`)
+4. Configure your Environment (via `php artisan p:environment:setup`)
+5. Set up your Database (via `php artisan p:environment:database`) and run Migrations (via `php artisan migrate --seed --force`)
+6. Create your first Admin User (via `php artisan p:user:make`)
+7. Start your Webserver (e.g. Nginx or Apache)
+
+As IDE we recommend [Visual Studio](https://visualstudio.microsoft.com)/ [Visual Studio Code](https://code.visualstudio.com) (free) or [PhpStorm](https://www.jetbrains.com/phpstorm) (paid).
+
+To easily install PHP and the Webserver we recommend Laravel Herd. ([Windows](https://herd.laravel.com/windows) & [macOS](https://herd.laravel.com))
+The (paid) Pro version of Laravel Herd also offers easy MySQL and Redis hosting, but it is not needed.
+
+## Coding Standards
+
+We use PHPStan/ [Larastan](https://github.com/larastan/larastan) and PHP-CS-Fixer/ [Pint](https://laravel.com/docs/11.x/pint) to enforce certain code styles and standards.
+You can run PHPStan via `\vendor\bin\phpstan analyse` and Pint via `\vendor\bin\pint`.
+
+## Making Contributions
+
+From your forked repository, make your own changes on your own branch. (do not make changes directly to `main`!)
+When you are ready, you can submit a pull request to the Pelican repository. If you still work on your pull request or need help with something make sure to mark it as Draft.
+
+Also, please make sure that your pull requests are as targeted and simple as possible and don't do a hundred things at a time. If you want to add/ change/ fix 5 different things you should make 5 different pull requests.
+
+*Note: For now we only accept pull requests that handle existing issues!*
+
+## Code Review Process
+
+Your pull request will then be reviewed by the maintainers.
+Once you have an approval from a maintainer, another will merge it once it’s confirmed.
+
+Depending on the pull request size this process can take multiple days.
+
+## Community and Support
+
+* Help: [Discord](https://discord.gg/pelican-panel)
+* Bugs: [GitHub Issues](https://github.com/pelican-dev/panel/issues)
+* Features: [GitHub Discussions](https://github.com/pelican-dev/panel/discussions)
+* Security vulnerabilities: See our [security policy](./security.md).
diff --git a/database/.gitignore b/database/.gitignore
index 9b1dffd90..0c40e2f77 100644
--- a/database/.gitignore
+++ b/database/.gitignore
@@ -1 +1,2 @@
*.sqlite
+*.sqlite.backup
diff --git a/database/Seeders/eggs/minecraft/egg-bungeecord.json b/database/Seeders/eggs/minecraft/egg-bungeecord.json
index 9a2f68233..66fcbc885 100644
--- a/database/Seeders/eggs/minecraft/egg-bungeecord.json
+++ b/database/Seeders/eggs/minecraft/egg-bungeecord.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/minecraft\/egg-bungeecord.json"
},
- "exported_at": "2024-07-03T10:30:17+00:00",
+ "exported_at": "2024-07-25T12:03:12+00:00",
"name": "Bungeecord",
"author": "panel@example.com",
"uuid": "9e6b409e-4028-4947-aea8-50a2c404c271",
@@ -44,7 +44,11 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "required|alpha_num|between:1,6",
+ "rules": [
+ "required",
+ "alpha_num",
+ "between:1,6"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -55,7 +59,10 @@
"default_value": "bungeecord.jar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/",
+ "rules": [
+ "required",
+ "regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -71,4 +78,4 @@
"field_type": "text"
}
]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/minecraft/egg-forge-minecraft.json b/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
index dcae88222..cd7560a12 100644
--- a/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
+++ b/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/minecraft\/egg-forge-minecraft.json"
},
- "exported_at": "2024-07-03T10:30:18+00:00",
+ "exported_at": "2024-07-25T12:03:19+00:00",
"name": "Forge Minecraft",
"author": "panel@example.com",
"uuid": "ed072427-f209-4603-875c-f540c6dd5a65",
@@ -44,7 +44,10 @@
"default_value": "server.jar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/",
+ "rules": [
+ "required",
+ "regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -55,7 +58,11 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:9",
+ "rules": [
+ "required",
+ "string",
+ "max:9"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -66,7 +73,11 @@
"default_value": "recommended",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|in:recommended,latest",
+ "rules": [
+ "required",
+ "string",
+ "in:recommended,latest"
+ ],
"sort": 3,
"field_type": "text"
},
@@ -77,7 +88,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|regex:\/^[0-9\\.\\-]+$\/",
+ "rules": [
+ "nullable",
+ "regex:\/^[0-9\\.\\-]+$\/"
+ ],
"sort": 4,
"field_type": "text"
},
@@ -93,4 +107,4 @@
"field_type": "text"
}
]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/minecraft/egg-paper.json b/database/Seeders/eggs/minecraft/egg-paper.json
index 89db21f56..d8a73b9f4 100644
--- a/database/Seeders/eggs/minecraft/egg-paper.json
+++ b/database/Seeders/eggs/minecraft/egg-paper.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/minecraft\/egg-paper.json"
},
- "exported_at": "2024-07-03T10:30:19+00:00",
+ "exported_at": "2024-07-25T12:03:43+00:00",
"name": "Paper",
"author": "parker@example.com",
"uuid": "5da37ef6-58da-4169-90a6-e683e1721247",
@@ -44,7 +44,11 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string|max:20",
+ "rules": [
+ "nullable",
+ "string",
+ "max:20"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -55,7 +59,10 @@
"default_value": "server.jar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/",
+ "rules": [
+ "required",
+ "regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -66,7 +73,10 @@
"default_value": "",
"user_viewable": false,
"user_editable": false,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 3,
"field_type": "text"
},
@@ -77,20 +87,13 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:20",
+ "rules": [
+ "required",
+ "string",
+ "max:20"
+ ],
"sort": 4,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "25565",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 5,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json b/database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json
index d910cfb33..1a72aefe7 100644
--- a/database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json
+++ b/database/Seeders/eggs/minecraft/egg-sponge-sponge-vanilla.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/minecraft\/egg-sponge--sponge-vanilla.json"
},
- "exported_at": "2024-07-03T10:30:19+00:00",
+ "exported_at": "2024-07-25T12:03:55+00:00",
"name": "Sponge (SpongeVanilla)",
"author": "panel@example.com",
"uuid": "f0d2f88f-1ff3-42a0-b03f-ac44c5571e6d",
@@ -37,17 +37,6 @@
}
},
"variables": [
- {
- "name": "Server Port",
- "description": "Main Port",
- "env_variable": "SERVER_PORT",
- "default_value": "null",
- "user_viewable": true,
- "user_editable": false,
- "rules": "port",
- "sort": 1,
- "field_type": "text"
- },
{
"name": "Sponge Version",
"description": "The version of SpongeVanilla to download and use.",
@@ -55,8 +44,11 @@
"default_value": "1.12.2-7.3.0",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([a-zA-Z0-9.\\-_]+)$\/",
- "sort": 2,
+ "rules": [
+ "required",
+ "regex:\/^([a-zA-Z0-9.\\-_]+)$\/"
+ ],
+ "sort": 1,
"field_type": "text"
},
{
@@ -66,19 +58,11 @@
"default_value": "server.jar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/",
- "sort": 3,
- "field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "25565",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 4,
+ "rules": [
+ "required",
+ "regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+ ],
+ "sort": 2,
"field_type": "text"
}
]
diff --git a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
index 8698c3a55..71d71938e 100644
--- a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
+++ b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/minecraft\/egg-vanilla-minecraft.json"
},
- "exported_at": "2024-07-03T10:30:20+00:00",
+ "exported_at": "2024-07-25T12:04:05+00:00",
"name": "Vanilla Minecraft",
"author": "panel@example.com",
"uuid": "9ac39f3d-0c34-4d93-8174-c52ab9e6c57b",
@@ -44,7 +44,10 @@
"default_value": "server.jar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/",
+ "rules": [
+ "required",
+ "regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -55,20 +58,13 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|between:3,15",
+ "rules": [
+ "required",
+ "string",
+ "between:3,15"
+ ],
"sort": 2,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "25565",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 3,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/rust/egg-rust.json b/database/Seeders/eggs/rust/egg-rust.json
index 30aa18534..cd0367c3f 100644
--- a/database/Seeders/eggs/rust/egg-rust.json
+++ b/database/Seeders/eggs/rust/egg-rust.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/rust\/egg-rust.json"
},
- "exported_at": "2024-07-03T10:30:26+00:00",
+ "exported_at": "2024-07-25T12:06:17+00:00",
"name": "Rust",
"author": "panel@example.com",
"uuid": "bace2dfb-209c-452a-9459-7d6f340b07ae",
@@ -38,7 +38,11 @@
"default_value": "A Rust Server",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:60",
+ "rules": [
+ "required",
+ "string",
+ "max:60"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -49,7 +53,10 @@
"default_value": "vanilla",
"user_viewable": true,
"user_editable": true,
- "rules": "required|in:vanilla,oxide,carbon",
+ "rules": [
+ "required",
+ "in:vanilla,oxide,carbon"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -60,7 +67,11 @@
"default_value": "Procedural Map",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:20",
+ "rules": [
+ "required",
+ "string",
+ "max:20"
+ ],
"sort": 3,
"field_type": "text"
},
@@ -71,7 +82,10 @@
"default_value": "Powered by Panel",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string",
+ "rules": [
+ "required",
+ "string"
+ ],
"sort": 4,
"field_type": "text"
},
@@ -82,7 +96,10 @@
"default_value": "http:\/\/example.com",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|url",
+ "rules": [
+ "nullable",
+ "url"
+ ],
"sort": 5,
"field_type": "text"
},
@@ -93,7 +110,10 @@
"default_value": "3000",
"user_viewable": true,
"user_editable": true,
- "rules": "required|integer",
+ "rules": [
+ "required",
+ "integer"
+ ],
"sort": 6,
"field_type": "text"
},
@@ -104,7 +124,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 7,
"field_type": "text"
},
@@ -115,7 +138,10 @@
"default_value": "40",
"user_viewable": true,
"user_editable": true,
- "rules": "required|integer",
+ "rules": [
+ "required",
+ "integer"
+ ],
"sort": 8,
"field_type": "text"
},
@@ -126,7 +152,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|url",
+ "rules": [
+ "nullable",
+ "url"
+ ],
"sort": 9,
"field_type": "text"
},
@@ -137,7 +166,10 @@
"default_value": "27017",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
+ "rules": [
+ "required",
+ "port"
+ ],
"sort": 10,
"field_type": "text"
},
@@ -148,7 +180,10 @@
"default_value": "28016",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
+ "rules": [
+ "required",
+ "port"
+ ],
"sort": 11,
"field_type": "text"
},
@@ -159,7 +194,11 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^[\\w.-]*$\/|max:64",
+ "rules": [
+ "required",
+ "regex:\/^[\\w.-]*$\/",
+ "max:64"
+ ],
"sort": 12,
"field_type": "text"
},
@@ -170,7 +209,10 @@
"default_value": "60",
"user_viewable": true,
"user_editable": true,
- "rules": "required|integer",
+ "rules": [
+ "required",
+ "integer"
+ ],
"sort": 13,
"field_type": "text"
},
@@ -181,7 +223,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 14,
"field_type": "text"
},
@@ -192,7 +237,10 @@
"default_value": "28082",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
+ "rules": [
+ "required",
+ "port"
+ ],
"sort": 15,
"field_type": "text"
},
@@ -203,7 +251,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|url",
+ "rules": [
+ "nullable",
+ "url"
+ ],
"sort": 16,
"field_type": "text"
},
@@ -214,7 +265,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|url",
+ "rules": [
+ "nullable",
+ "url"
+ ],
"sort": 17,
"field_type": "text"
},
@@ -225,9 +279,13 @@
"default_value": "258550",
"user_viewable": false,
"user_editable": false,
- "rules": "required|string|in:258550",
+ "rules": [
+ "required",
+ "string",
+ "in:258550"
+ ],
"sort": 18,
"field_type": "text"
}
]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json b/database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json
index 887610caf..1c092bd21 100644
--- a/database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json
+++ b/database/Seeders/eggs/source-engine/egg-counter-strike-global-offensive.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/source-engine\/egg-counter--strike--global-offensive.json"
},
- "exported_at": "2024-07-03T10:30:21+00:00",
+ "exported_at": "2024-07-25T12:04:25+00:00",
"name": "Counter-Strike: Global Offensive",
"author": "panel@example.com",
"uuid": "437c367d-06be-498f-a604-fdad135504d7",
@@ -39,7 +39,11 @@
"default_value": "de_dust2",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|alpha_dash",
+ "rules": [
+ "required",
+ "string",
+ "alpha_dash"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -50,7 +54,12 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|alpha_num|size:32",
+ "rules": [
+ "required",
+ "string",
+ "alpha_num",
+ "size:32"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -61,20 +70,13 @@
"default_value": "740",
"user_viewable": false,
"user_editable": false,
- "rules": "required|string|max:20",
+ "rules": [
+ "required",
+ "string",
+ "max:20"
+ ],
"sort": 3,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "27015",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 4,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
index a104ff83d..1126e629f 100644
--- a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
+++ b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/source-engine\/egg-custom-source-engine-game.json"
},
- "exported_at": "2024-07-03T10:30:22+00:00",
+ "exported_at": "2024-07-25T12:03:27+00:00",
"name": "Custom Source Engine Game",
"author": "panel@example.com",
"uuid": "2a42d0c2-c0ba-4067-9a0a-9b95d77a3490",
@@ -38,7 +38,11 @@
"default_value": "",
"user_viewable": true,
"user_editable": false,
- "rules": "required|numeric|digits_between:1,6",
+ "rules": [
+ "required",
+ "numeric",
+ "digits_between:1,6"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -49,7 +53,11 @@
"default_value": "",
"user_viewable": true,
"user_editable": false,
- "rules": "required|alpha_dash|between:1,100",
+ "rules": [
+ "required",
+ "alpha_dash",
+ "between:1,100"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -60,7 +68,11 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|alpha_dash",
+ "rules": [
+ "required",
+ "string",
+ "alpha_dash"
+ ],
"sort": 3,
"field_type": "text"
},
@@ -71,7 +83,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 4,
"field_type": "text"
},
@@ -82,7 +97,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 5,
"field_type": "text"
},
@@ -93,20 +111,12 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string",
+ "rules": [
+ "nullable",
+ "string"
+ ],
"sort": 6,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 7,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/source-engine/egg-garrys-mod.json b/database/Seeders/eggs/source-engine/egg-garrys-mod.json
index 0b853ed2d..21a289cd5 100644
--- a/database/Seeders/eggs/source-engine/egg-garrys-mod.json
+++ b/database/Seeders/eggs/source-engine/egg-garrys-mod.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/source-engine\/egg-garrys-mod.json"
},
- "exported_at": "2024-07-03T10:30:22+00:00",
+ "exported_at": "2024-07-25T12:05:02+00:00",
"name": "Garrys Mod",
"author": "panel@example.com",
"uuid": "60ef81d4-30a2-4d98-ab64-f59c69e2f915",
@@ -39,7 +39,11 @@
"default_value": "gm_flatgrass",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|alpha_dash",
+ "rules": [
+ "required",
+ "string",
+ "alpha_dash"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -50,7 +54,12 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|string|alpha_num|size:32",
+ "rules": [
+ "nullable",
+ "string",
+ "alpha_num",
+ "size:32"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -61,7 +70,11 @@
"default_value": "4020",
"user_viewable": false,
"user_editable": false,
- "rules": "required|string|max:20",
+ "rules": [
+ "required",
+ "string",
+ "max:20"
+ ],
"sort": 3,
"field_type": "text"
},
@@ -72,7 +85,10 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "nullable|integer",
+ "rules": [
+ "nullable",
+ "integer"
+ ],
"sort": 4,
"field_type": "text"
},
@@ -83,7 +99,10 @@
"default_value": "sandbox",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string",
+ "rules": [
+ "required",
+ "string"
+ ],
"sort": 5,
"field_type": "text"
},
@@ -94,7 +113,11 @@
"default_value": "32",
"user_viewable": true,
"user_editable": true,
- "rules": "required|integer|max:128",
+ "rules": [
+ "required",
+ "integer",
+ "max:128"
+ ],
"sort": 6,
"field_type": "text"
},
@@ -105,7 +128,11 @@
"default_value": "22",
"user_viewable": true,
"user_editable": true,
- "rules": "required|integer|max:100",
+ "rules": [
+ "required",
+ "integer",
+ "max:100"
+ ],
"sort": 7,
"field_type": "text"
},
@@ -116,20 +143,12 @@
"default_value": "0",
"user_viewable": true,
"user_editable": true,
- "rules": "required|boolean",
+ "rules": [
+ "required",
+ "boolean"
+ ],
"sort": 8,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "27015",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 9,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/source-engine/egg-insurgency.json b/database/Seeders/eggs/source-engine/egg-insurgency.json
index fbbabe260..1c7e1525f 100644
--- a/database/Seeders/eggs/source-engine/egg-insurgency.json
+++ b/database/Seeders/eggs/source-engine/egg-insurgency.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/source-engine\/egg-insurgency.json"
},
- "exported_at": "2024-07-03T10:30:23+00:00",
+ "exported_at": "2024-07-25T12:05:30+00:00",
"name": "Insurgency",
"author": "panel@example.com",
"uuid": "a5702286-655b-4069-bf1e-925c7300b61a",
@@ -38,7 +38,10 @@
"default_value": "237410",
"user_viewable": true,
"user_editable": false,
- "rules": "required|regex:\/^(237410)$\/",
+ "rules": [
+ "required",
+ "regex:\/^(237410)$\/"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -49,20 +52,12 @@
"default_value": "sinjar",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^(\\w{1,20})$\/",
+ "rules": [
+ "required",
+ "regex:\/^(\\w{1,20})$\/"
+ ],
"sort": 2,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "27015",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 3,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/source-engine/egg-team-fortress2.json b/database/Seeders/eggs/source-engine/egg-team-fortress2.json
index 101912570..667d04555 100644
--- a/database/Seeders/eggs/source-engine/egg-team-fortress2.json
+++ b/database/Seeders/eggs/source-engine/egg-team-fortress2.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/source-engine\/egg-team-fortress2.json"
},
- "exported_at": "2024-07-03T10:30:24+00:00",
+ "exported_at": "2024-07-25T12:05:42+00:00",
"name": "Team Fortress 2",
"author": "panel@example.com",
"uuid": "7f8eb681-b2c8-4bf8-b9f4-d79ff70b6e5d",
@@ -39,7 +39,10 @@
"default_value": "232250",
"user_viewable": true,
"user_editable": false,
- "rules": "required|in:232250",
+ "rules": [
+ "required",
+ "in:232250"
+ ],
"sort": 1,
"field_type": "text"
},
@@ -50,7 +53,10 @@
"default_value": "cp_dustbowl",
"user_viewable": true,
"user_editable": true,
- "rules": "required|regex:\/^(\\w{1,20})$\/",
+ "rules": [
+ "required",
+ "regex:\/^(\\w{1,20})$\/"
+ ],
"sort": 2,
"field_type": "text"
},
@@ -61,20 +67,14 @@
"default_value": "",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|alpha_num|size:32",
+ "rules": [
+ "required",
+ "string",
+ "alpha_num",
+ "size:32"
+ ],
"sort": 3,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "27015",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 4,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/voice-servers/egg-mumble-server.json b/database/Seeders/eggs/voice-servers/egg-mumble-server.json
index 8ab2ac06d..a4c02919f 100644
--- a/database/Seeders/eggs/voice-servers/egg-mumble-server.json
+++ b/database/Seeders/eggs/voice-servers/egg-mumble-server.json
@@ -2,9 +2,9 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/voice-servers\/egg-mumble-server.json"
},
- "exported_at": "2024-07-03T10:30:24+00:00",
+ "exported_at": "2024-07-25T12:05:52+00:00",
"name": "Mumble Server",
"author": "panel@example.com",
"uuid": "727ee758-7fb2-4979-972b-d3eba4e1e9f0",
@@ -36,20 +36,13 @@
"default_value": "100",
"user_viewable": true,
"user_editable": false,
- "rules": "required|numeric|digits_between:1,5",
+ "rules": [
+ "required",
+ "numeric",
+ "digits_between:1,5"
+ ],
"sort": 1,
"field_type": "text"
- },
- {
- "name": "Server Port",
- "description": "",
- "env_variable": "SERVER_PORT",
- "default_value": "64738",
- "user_viewable": true,
- "user_editable": false,
- "rules": "required|port",
- "sort": 2,
- "field_type": "text"
}
]
}
\ No newline at end of file
diff --git a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json
index 3cddb0463..d470ca3f2 100644
--- a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json
+++ b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json
@@ -2,14 +2,14 @@
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL",
"meta": {
"version": "PTDL_v2",
- "update_url": null
+ "update_url": "https:\/\/github.com\/pelican-dev\/panel\/raw\/main\/database\/Seeders\/eggs\/voice-servers\/egg-teamspeak3-server.json"
},
- "exported_at": "2024-07-03T10:30:25+00:00",
+ "exported_at": "2024-07-25T12:06:05+00:00",
"name": "Teamspeak3 Server",
"author": "panel@example.com",
"uuid": "983b1fac-d322-4d5f-a636-436127326b37",
"description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.",
- "features": null,
+ "features": [],
"docker_images": {
"Debian": "ghcr.io\/parkervcp\/yolks:debian"
},
@@ -36,8 +36,12 @@
"default_value": "latest",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:6",
- "sort": null,
+ "rules": [
+ "required",
+ "string",
+ "max:6"
+ ],
+ "sort": 1,
"field_type": "text"
},
{
@@ -47,8 +51,11 @@
"default_value": "30033",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
- "sort": null,
+ "rules": [
+ "required",
+ "port"
+ ],
+ "sort": 2,
"field_type": "text"
},
{
@@ -58,8 +65,12 @@
"default_value": "10011",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
- "sort": null,
+ "rules": [
+ "required",
+ "integer",
+ "port"
+ ],
+ "sort": 3,
"field_type": "text"
},
{
@@ -69,8 +80,12 @@
"default_value": "raw,http,ssh",
"user_viewable": true,
"user_editable": true,
- "rules": "required|string|max:12",
- "sort": null,
+ "rules": [
+ "required",
+ "string",
+ "max:12"
+ ],
+ "sort": 4,
"field_type": "text"
},
{
@@ -81,7 +96,11 @@
"user_viewable": true,
"user_editable": false,
"rules": "required|port",
- "sort": null,
+ "rules": [
+ "required",
+ "port"
+ ],
+ "sort": 5,
"field_type": "text"
},
{
@@ -91,9 +110,12 @@
"default_value": "10080",
"user_viewable": true,
"user_editable": false,
- "rules": "required|port",
- "sort": null,
+ "rules": [
+ "required",
+ "port",
+ ],
+ "sort": 6,
"field_type": "text"
}
]
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2024_07_08_112948_fix-activity-log-timestamp-default.php b/database/migrations/2024_07_08_112948_fix-activity-log-timestamp-default.php
new file mode 100644
index 000000000..892ca1826
--- /dev/null
+++ b/database/migrations/2024_07_08_112948_fix-activity-log-timestamp-default.php
@@ -0,0 +1,28 @@
+timestamp('timestamp')->default(null)->change();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('activity_logs', function (Blueprint $table) {
+ $table->timestamp('timestamp')->useCurrent()->change();
+ });
+ }
+};
diff --git a/database/migrations/2024_07_12_095213_fix_missing_sqlite_foreign_keys.php b/database/migrations/2024_07_12_095213_fix_missing_sqlite_foreign_keys.php
new file mode 100644
index 000000000..47c78a09a
--- /dev/null
+++ b/database/migrations/2024_07_12_095213_fix_missing_sqlite_foreign_keys.php
@@ -0,0 +1,284 @@
+getDriverName() !== 'sqlite') {
+ return;
+ }
+
+ // Disable foreign checks
+ // legacy_alter_table needs to be 'ON' so existing foreign key table references aren't renamed when renaming the table, see https://www.sqlite.org/lang_altertable.html
+ DB::statement('PRAGMA foreign_keys = OFF');
+ DB::statement('PRAGMA legacy_alter_table = ON');
+
+ DB::transaction(function () {
+ // api_keys_user_id_foreign
+ DB::statement('ALTER TABLE api_keys RENAME TO _api_keys_old');
+ DB::statement('CREATE TABLE api_keys
+ ("id" integer primary key autoincrement not null,
+ "token" text not null,
+ "allowed_ips" text not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "user_id" integer not null,
+ "memo" text,
+ "r_servers" integer not null default \'0\',
+ "r_nodes" integer not null default \'0\',
+ "r_allocations" integer not null default \'0\',
+ "r_users" integer not null default \'0\',
+ "r_eggs" integer not null default \'0\',
+ "r_database_hosts" integer not null default \'0\',
+ "r_server_databases" integer not null default \'0\',
+ "identifier" varchar,
+ "key_type" integer not null default \'0\',
+ "last_used_at" datetime,
+ "expires_at" datetime,
+ "r_mounts" integer not null default \'0\',
+ foreign key("user_id") references "users"("id") on delete cascade)');
+ DB::statement('INSERT INTO api_keys SELECT * FROM _api_keys_old');
+ DB::statement('DROP TABLE _api_keys_old');
+ DB::statement('CREATE UNIQUE INDEX "api_keys_identifier_unique" on "api_keys" ("identifier")');
+
+ // database_hosts_node_id_foreign
+ DB::statement('ALTER TABLE database_hosts RENAME TO _database_hosts_old');
+ DB::statement('CREATE TABLE database_hosts
+ ("id" integer primary key autoincrement not null,
+ "name" varchar not null,
+ "host" varchar not null,
+ "port" integer not null,
+ "username" varchar not null,
+ "password" text not null,
+ "max_databases" integer,
+ "node_id" integer,
+ "created_at" datetime,
+ "updated_at" datetime,
+ foreign key("node_id") references "nodes"("id") on delete set null)');
+ DB::statement('INSERT INTO database_hosts SELECT * FROM _database_hosts_old');
+ DB::statement('DROP TABLE _database_hosts_old');
+
+ // mount_node_node_id_foreign
+ // mount_node_mount_id_foreign
+ DB::statement('ALTER TABLE mount_node RENAME TO _mount_node_old');
+ DB::statement('CREATE TABLE mount_node
+ ("node_id" integer not null,
+ "mount_id" integer not null,
+ foreign key("node_id") references "nodes"("id") on delete cascade on update cascade,
+ foreign key("mount_id") references "mounts"("id") on delete cascade on update cascade)');
+ DB::statement('INSERT INTO mount_node SELECT * FROM _mount_node_old');
+ DB::statement('DROP TABLE _mount_node_old');
+ DB::statement('CREATE UNIQUE INDEX "mount_node_node_id_mount_id_unique" on "mount_node" ("node_id", "mount_id")');
+
+ // servers_node_id_foreign
+ // servers_owner_id_foreign
+ // servers_egg_id_foreign
+ // servers_allocation_id_foreign
+ DB::statement('ALTER TABLE servers RENAME TO _servers_old');
+ DB::statement('CREATE TABLE servers
+ ("id" integer primary key autoincrement not null,
+ "uuid" varchar not null,
+ "uuid_short" varchar not null,
+ "node_id" integer not null,
+ "name" varchar not null,
+ "owner_id" integer not null,
+ "memory" integer not null,
+ "swap" integer not null,
+ "disk" integer not null,
+ "io" integer not null,
+ "cpu" integer not null,
+ "egg_id" integer not null,
+ "startup" text not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "allocation_id" integer not null,
+ "image" varchar not null,
+ "description" text not null,
+ "skip_scripts" tinyint(1) not null default \'0\',
+ "external_id" varchar,
+ "database_limit" integer default \'0\',
+ "allocation_limit" integer,
+ "threads" varchar,
+ "backup_limit" integer not null default \'0\',
+ "status" varchar,
+ "installed_at" datetime,
+ "oom_killer" integer not null default \'0\',
+ "docker_labels" text,
+ foreign key("node_id") references "nodes"("id"),
+ foreign key("owner_id") references "users"("id"),
+ foreign key("egg_id") references "eggs"("id"),
+ foreign key("allocation_id") references "allocations"("id"))');
+ DB::statement('INSERT INTO servers SELECT * FROM _servers_old');
+ DB::statement('DROP TABLE _servers_old');
+ DB::statement('CREATE UNIQUE INDEX "servers_allocation_id_unique" on "servers" ("allocation_id")');
+ DB::statement('CREATE UNIQUE INDEX "servers_external_id_unique" on "servers" ("external_id")');
+ DB::statement('CREATE UNIQUE INDEX "servers_uuid_unique" on "servers" ("uuid")');
+ DB::statement('CREATE UNIQUE INDEX "servers_uuidshort_unique" on "servers" ("uuid_short")');
+
+ // databases_server_id_foreign
+ // databases_database_host_id_foreign
+ DB::statement('ALTER TABLE databases RENAME TO _databases_old');
+ DB::statement('CREATE TABLE databases
+ ("id" integer primary key autoincrement not null,
+ "server_id" integer not null,
+ "database_host_id" integer not null,
+ "database" varchar not null,
+ "username" varchar not null,
+ "remote" varchar not null default \'%\',
+ "password" text not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "max_connections" integer default \'0\',
+ foreign key("server_id") references "servers"("id"),
+ foreign key("database_host_id") references "database_hosts"("id"))');
+ DB::statement('INSERT INTO databases SELECT * FROM _databases_old');
+ DB::statement('DROP TABLE _databases_old');
+ DB::statement('CREATE UNIQUE INDEX "databases_database_host_id_server_id_database_unique" on "databases" ("database_host_id", "server_id", "database")');
+ DB::statement('CREATE UNIQUE INDEX "databases_database_host_id_username_unique" on "databases" ("database_host_id", "username")');
+
+ // allocations_node_id_foreign
+ // allocations_server_id_foreign
+ DB::statement('ALTER TABLE allocations RENAME TO _allocations_old');
+ DB::statement('CREATE TABLE allocations
+ ("id" integer primary key autoincrement not null,
+ "node_id" integer not null,
+ "ip" varchar not null,
+ "port" integer not null,
+ "server_id" integer,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "ip_alias" text,
+ "notes" varchar,
+ foreign key("node_id") references "nodes"("id") on delete cascade,
+ foreign key("server_id") references "servers"("id") on delete cascade on update set null)');
+ DB::statement('INSERT INTO allocations SELECT * FROM _allocations_old');
+ DB::statement('DROP TABLE _allocations_old');
+ DB::statement('CREATE UNIQUE INDEX "allocations_node_id_ip_port_unique" on "allocations" ("node_id", "ip", "port")');
+
+ // eggs_config_from_foreign
+ // eggs_copy_script_from_foreign
+ DB::statement('ALTER TABLE eggs RENAME TO _eggs_old');
+ DB::statement('CREATE TABLE eggs
+ ("id" integer primary key autoincrement not null,
+ "name" varchar not null,
+ "description" text,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "startup" text,
+ "config_from" integer,
+ "config_stop" varchar,
+ "config_logs" text,
+ "config_startup" text,
+ "config_files" text,
+ "script_install" text,
+ "script_is_privileged" tinyint(1) not null default \'1\',
+ "script_entry" varchar not null default \'ash\',
+ "script_container" varchar not null default \'alpine:3.4\',
+ "copy_script_from" integer,
+ "uuid" varchar not null,
+ "author" varchar not null,
+ "features" text,
+ "docker_images" text,
+ "update_url" text,
+ "file_denylist" text,
+ "force_outgoing_ip" tinyint(1) not null default \'0\',
+ "tags" text not null,
+ foreign key("config_from") references "eggs"("id") on delete set null,
+ foreign key("copy_script_from") references "eggs"("id") on delete set null)');
+ DB::statement('INSERT INTO eggs SELECT * FROM _eggs_old');
+ DB::statement('DROP TABLE _eggs_old');
+ DB::statement('CREATE UNIQUE INDEX "service_options_uuid_unique" on "eggs" ("uuid")');
+
+ // egg_mount_mount_id_foreign
+ // egg_mount_egg_id_foreign
+ DB::statement('ALTER TABLE egg_mount RENAME TO _egg_mount_old');
+ DB::statement('CREATE TABLE egg_mount
+ ("egg_id" integer not null,
+ "mount_id" integer not null,
+ foreign key("egg_id") references "eggs"("id") on delete cascade on update cascade,
+ foreign key("mount_id") references "mounts"("id") on delete cascade on update cascade)');
+ DB::statement('INSERT INTO egg_mount SELECT * FROM _egg_mount_old');
+ DB::statement('DROP TABLE _egg_mount_old');
+ DB::statement('CREATE UNIQUE INDEX "egg_mount_egg_id_mount_id_unique" on "egg_mount" ("egg_id", "mount_id")');
+
+ // service_variables_egg_id_foreign
+ DB::statement('ALTER TABLE egg_variables RENAME TO _egg_variables_old');
+ DB::statement('CREATE TABLE egg_variables
+ ("id" integer primary key autoincrement not null,
+ "egg_id" integer not null,
+ "name" varchar not null,
+ "description" text not null,
+ "env_variable" varchar not null,
+ "default_value" text not null,
+ "user_viewable" integer not null,
+ "user_editable" integer not null,
+ "rules" text not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "sort" integer,
+ foreign key("egg_id") references "eggs"("id") on delete cascade)');
+ DB::statement('INSERT INTO egg_variables SELECT * FROM _egg_variables_old');
+ DB::statement('DROP TABLE _egg_variables_old');
+
+ // mount_server_server_id_foreign
+ // mount_server_mount_id_foreign
+ DB::statement('ALTER TABLE mount_server RENAME TO _mount_server_old');
+ DB::statement('CREATE TABLE mount_server
+ ("server_id" integer not null,
+ "mount_id" integer not null,
+ foreign key("server_id") references "servers"("id") on delete cascade on update cascade,
+ foreign key("mount_id") references "mounts"("id") on delete cascade on update cascade)');
+ DB::statement('INSERT INTO mount_server SELECT * FROM _mount_server_old');
+ DB::statement('DROP TABLE _mount_server_old');
+ DB::statement('CREATE UNIQUE INDEX "mount_server_server_id_mount_id_unique" on "mount_server" ("server_id", "mount_id")');
+
+ // server_variables_variable_id_foreign
+ DB::statement('ALTER TABLE server_variables RENAME TO _server_variables_old');
+ DB::statement('CREATE TABLE server_variables
+ ("id" integer primary key autoincrement not null,
+ "server_id" integer not null,
+ "variable_id" integer not null,
+ "variable_value" text not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ foreign key("server_id") references "servers"("id") on delete cascade,
+ foreign key("variable_id") references "egg_variables"("id") on delete cascade)');
+ DB::statement('INSERT INTO server_variables SELECT * FROM _server_variables_old');
+ DB::statement('DROP TABLE _server_variables_old');
+
+ // subusers_user_id_foreign
+ // subusers_server_id_foreign
+ DB::statement('ALTER TABLE subusers RENAME TO _subusers_old');
+ DB::statement('CREATE TABLE subusers
+ ("id" integer primary key autoincrement not null,
+ "user_id" integer not null,
+ "server_id" integer not null,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "permissions" text,
+ foreign key("user_id") references "users"("id") on delete cascade,
+ foreign key("server_id") references "servers"("id") on delete cascade)');
+ DB::statement('INSERT INTO subusers SELECT * FROM _subusers_old');
+ DB::statement('DROP TABLE _subusers_old');
+ });
+
+ DB::statement('PRAGMA foreign_keys = ON');
+ DB::statement('PRAGMA legacy_alter_table = OFF');
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ // Reverse not needed
+ }
+};
diff --git a/database/migrations/2024_07_25_072050_convert_rules_to_array.php b/database/migrations/2024_07_25_072050_convert_rules_to_array.php
new file mode 100644
index 000000000..6646a6661
--- /dev/null
+++ b/database/migrations/2024_07_25_072050_convert_rules_to_array.php
@@ -0,0 +1,37 @@
+select(['id', 'rules'])->cursor()->each(function ($eggVariable) {
+ DB::table('egg_variables')->where('id', $eggVariable->id)->update(['rules' => explode('|', $eggVariable->rules)]);
+ });
+
+ Schema::table('egg_variables', function (Blueprint $table) {
+ $table->json('rules')->change();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('egg_variables', function (Blueprint $table) {
+ $table->text('rules')->change();
+ });
+
+ DB::table('egg_variables')->select(['id', 'rules'])->cursor()->each(function ($eggVariable) {
+ DB::table('egg_variables')->where('id', $eggVariable->id)->update(['rules' => implode('|', json_decode($eggVariable->rules))]);
+ });
+ }
+};
diff --git a/database/migrations/2024_08_13_171337_fix_allocation_server_foreign_key.php b/database/migrations/2024_08_13_171337_fix_allocation_server_foreign_key.php
new file mode 100644
index 000000000..9abb9317e
--- /dev/null
+++ b/database/migrations/2024_08_13_171337_fix_allocation_server_foreign_key.php
@@ -0,0 +1,54 @@
+getDriverName() !== 'sqlite') {
+ return;
+ }
+
+ // Disable foreign checks
+ // legacy_alter_table needs to be 'ON' so existing foreign key table references aren't renamed when renaming the table, see https://www.sqlite.org/lang_altertable.html
+ DB::statement('PRAGMA foreign_keys = OFF');
+ DB::statement('PRAGMA legacy_alter_table = ON');
+
+ DB::transaction(function () {
+ DB::statement('ALTER TABLE allocations RENAME TO _allocations_old');
+ DB::statement('CREATE TABLE allocations
+ ("id" integer primary key autoincrement not null,
+ "node_id" integer not null,
+ "ip" varchar not null,
+ "port" integer not null,
+ "server_id" integer,
+ "created_at" datetime,
+ "updated_at" datetime,
+ "ip_alias" text,
+ "notes" varchar,
+ foreign key("node_id") references "nodes"("id") on delete cascade,
+ foreign key("server_id") references "servers"("id") on delete set null)');
+ DB::statement('INSERT INTO allocations SELECT * FROM _allocations_old');
+ DB::statement('DROP TABLE _allocations_old');
+ DB::statement('CREATE UNIQUE INDEX "allocations_node_id_ip_port_unique" on "allocations" ("node_id", "ip", "port")');
+ });
+
+ DB::statement('PRAGMA foreign_keys = ON');
+ DB::statement('PRAGMA legacy_alter_table = OFF');
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ // Reverse not needed
+ }
+};
diff --git a/database/migrations/2024_06_26_043350_modify_allocations.php b/database/migrations/2024_09_18_043350_modify_allocations.php
similarity index 100%
rename from database/migrations/2024_06_26_043350_modify_allocations.php
rename to database/migrations/2024_09_18_043350_modify_allocations.php
diff --git a/lang/en/commands.php b/lang/en/commands.php
index a42ca228b..b6fa6c9ca 100644
--- a/lang/en/commands.php
+++ b/lang/en/commands.php
@@ -6,11 +6,11 @@ return [
'author' => 'Provide the email address that eggs exported by this Panel should be from. This should be a valid email address.',
'url' => 'The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.',
'timezone' => "The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference https://php.net/manual/en/timezones.php.",
- 'settings_ui' => 'Enable UI based settings editor?',
],
'redis' => [
'note' => 'You\'ve selected the Redis driver for one or more options, please provide valid connection information below. In most cases you can use the defaults provided unless you have modified your setup.',
- 'comment' => 'By default a Redis server instance has no password as it is running locally and inaccessible to the outside world. If this is the case, simply hit enter without entering a value.',
+ 'comment' => 'By default a Redis server instance has for username default and no password as it is running locally and inaccessible to the outside world. If this is the case, simply hit enter without entering a value.',
+ 'confirm' => 'It seems a :field is already defined for Redis, would you like to change it?',
],
],
'database_settings' => [
diff --git a/lang/en/exceptions.php b/lang/en/exceptions.php
index 3c9adf4c9..9ec18f9b2 100644
--- a/lang/en/exceptions.php
+++ b/lang/en/exceptions.php
@@ -11,7 +11,7 @@ return [
'too_many_ports' => 'Adding more than 1000 ports in a single range at once is not supported.',
'invalid_mapping' => 'The mapping provided for :port was invalid and could not be processed.',
'cidr_out_of_range' => 'CIDR notation only allows masks between /25 and /32.',
- 'port_out_of_range' => 'Ports in an allocation must be greater than 1024 and less than or equal to 65535.',
+ 'port_out_of_range' => 'Ports in an allocation must be greater than or equal to 1024 and less than or equal to 65535.',
],
'egg' => [
'delete_has_servers' => 'An Egg with active servers attached to it cannot be deleted from the Panel.',
diff --git a/package.json b/package.json
index ebb3266be..713b5cbaf 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
"react-router-dom": "^5.1.2",
"react-transition-group": "^4.4.1",
"reaptcha": "^1.7.2",
+ "rimraf": "^4",
"sockette": "^2.0.6",
"styled-components": "^5.2.1",
"styled-components-breakpoint": "^3.0.0-preview.20",
@@ -130,7 +131,7 @@
"yarn-deduplicate": "^1.1.1"
},
"scripts": {
- "clean": "cd public/assets && find . \\( -name \"*.js\" -o -name \"*.map\" \\) -type f -delete",
+ "clean": "cd public/assets && rimraf -g *.js *.map",
"test": "jest",
"lint": "eslint ./resources/scripts/**/*.{ts,tsx} --ext .ts,.tsx",
"watch": "cross-env NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
diff --git a/readme.md b/readme.md
index 74b0c7998..210802d90 100644
--- a/readme.md
+++ b/readme.md
@@ -5,9 +5,6 @@
&color=rgba(255%2C%20255%2C%20255%2C%201))
&color=rgba(255%2C%20255%2C%20255%2C%201))
-
-
diff --git a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
index 36db1fff9..ee638e3f9 100644
--- a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
+++ b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
@@ -9,6 +9,7 @@ import {
faPencilAlt,
faToggleOn,
faTrashAlt,
+ faTrash,
} from '@fortawesome/free-solid-svg-icons';
import deleteScheduleTask from '@/api/server/schedules/deleteScheduleTask';
import { httpErrorToHuman } from '@/api/http';
@@ -35,6 +36,8 @@ const getActionDetails = (action: string): [string, any] => {
return ['Send Power Action', faToggleOn];
case 'backup':
return ['Create Backup', faFileArchive];
+ case 'delete_files':
+ return ['Delete Files', faTrash];
default:
return ['Unknown Action', faCode];
}
@@ -94,6 +97,9 @@ export default ({ schedule, task }: Props) => {
{task.action === 'backup' && (
Ignoring files & folders:
)}
+ {task.action === 'delete_files' && (
+
Files to delete:
+ )}
diff --git a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
index 0af8fb441..4903df931 100644
--- a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
+++ b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
@@ -34,7 +34,7 @@ interface Values {
}
const schema = object().shape({
- action: string().required().oneOf(['command', 'power', 'backup']),
+ action: string().required().oneOf(['command', 'power', 'backup', 'delete_files']),
payload: string().when('action', {
is: (v) => v !== 'backup',
then: string().required('A task payload must be provided.'),
@@ -131,6 +131,7 @@ const TaskDetailsModal = ({ schedule, task }: Props) => {
Send command
Send power action
Create backup
+ Delete files
@@ -166,7 +167,7 @@ const TaskDetailsModal = ({ schedule, task }: Props) => {
Ignored Files
{
+ ) : (
+
+ Files to Delete
+
+
+
)}
diff --git a/resources/views/admin/settings/advanced.blade.php b/resources/views/admin/settings/advanced.blade.php
deleted file mode 100644
index dc5543ca9..000000000
--- a/resources/views/admin/settings/advanced.blade.php
+++ /dev/null
@@ -1,127 +0,0 @@
-@extends('layouts.admin')
-@include('partials/admin.settings.nav', ['activeTab' => 'advanced'])
-
-@section('title')
- Advanced Settings
-@endsection
-
-@section('content-header')
-
Advanced SettingsConfigure advanced settings for Panel.
-
- Admin Settings
-
-@endsection
-
-@section('content')
- @yield('settings::nav')
-
-@endsection
diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php
deleted file mode 100644
index 19356e8b8..000000000
--- a/resources/views/admin/settings/index.blade.php
+++ /dev/null
@@ -1,75 +0,0 @@
-@extends('layouts.admin')
-@include('partials/admin.settings.nav', ['activeTab' => 'basic'])
-
-@section('title')
- Settings
-@endsection
-
-@section('content-header')
-
Panel SettingsConfigure Panel to your liking.
-
- Admin Settings
-
-@endsection
-
-@section('content')
- @yield('settings::nav')
-
-@endsection
diff --git a/resources/views/admin/settings/mail.blade.php b/resources/views/admin/settings/mail.blade.php
deleted file mode 100644
index 0488d1c7a..000000000
--- a/resources/views/admin/settings/mail.blade.php
+++ /dev/null
@@ -1,202 +0,0 @@
-@extends('layouts.admin')
-@include('partials/admin.settings.nav', ['activeTab' => 'mail'])
-
-@section('title')
- Mail Settings
-@endsection
-
-@section('content-header')
-
Mail SettingsConfigure how email sending should be handled.
-
- Admin Settings
-
-@endsection
-
-@section('content')
- @yield('settings::nav')
-
-
-
-
- @if($disabled)
-
-
-
-
- This interface is limited to instances using SMTP as the mail driver. Please either use php artisan p:environment:mail command to update your email settings, or set MAIL_DRIVER=smtp in your environment file.
-
-
-
-
- @else
-
- @endif
-
-
-
-@endsection
-
-@section('footer-scripts')
- @parent
-
-
-@endsection
diff --git a/resources/views/filament/components/node-cpu-chart.blade.php b/resources/views/filament/components/node-cpu-chart.blade.php
new file mode 100644
index 000000000..d2627c42d
--- /dev/null
+++ b/resources/views/filament/components/node-cpu-chart.blade.php
@@ -0,0 +1,3 @@
+
+ @livewire(\App\Filament\Resources\NodeResource\Widgets\NodeCpuChart::class, ['record'=> $getRecord()])
+
diff --git a/resources/views/filament/components/node-memory-chart.blade.php b/resources/views/filament/components/node-memory-chart.blade.php
new file mode 100644
index 000000000..cb934d007
--- /dev/null
+++ b/resources/views/filament/components/node-memory-chart.blade.php
@@ -0,0 +1,3 @@
+
+ @livewire(\App\Filament\Resources\NodeResource\Widgets\NodeMemoryChart::class, ['record'=> $getRecord()])
+
diff --git a/resources/views/filament/components/node-storage-chart.blade.php b/resources/views/filament/components/node-storage-chart.blade.php
new file mode 100644
index 000000000..ea7b5358c
--- /dev/null
+++ b/resources/views/filament/components/node-storage-chart.blade.php
@@ -0,0 +1,3 @@
+
+ @livewire(\App\Filament\Resources\NodeResource\Widgets\NodeStorageChart::class, ['record'=> $getRecord()])
+
diff --git a/resources/views/filament/pages/installer.blade.php b/resources/views/filament/pages/installer.blade.php
new file mode 100644
index 000000000..1977991c2
--- /dev/null
+++ b/resources/views/filament/pages/installer.blade.php
@@ -0,0 +1,7 @@
+
+
+ {{ $this->form }}
+
+
+
\ No newline at end of file
diff --git a/resources/views/filament/pages/settings.blade.php b/resources/views/filament/pages/settings.blade.php
new file mode 100644
index 000000000..9f9b3f439
--- /dev/null
+++ b/resources/views/filament/pages/settings.blade.php
@@ -0,0 +1,15 @@
+
+
+ {{ $this->form }}
+
+
+
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index d48fad64b..24b21db19 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -96,11 +96,6 @@
-
-
- Settings
-
-
Application API
diff --git a/resources/views/partials/admin/settings/nav.blade.php b/resources/views/partials/admin/settings/nav.blade.php
deleted file mode 100644
index 9f1ace7f3..000000000
--- a/resources/views/partials/admin/settings/nav.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@include('partials/admin.settings.notice')
-
-@section('settings::nav')
- @yield('settings::notice')
-
-@endsection
diff --git a/resources/views/partials/admin/settings/notice.blade.php b/resources/views/partials/admin/settings/notice.blade.php
deleted file mode 100644
index 980c5ef60..000000000
--- a/resources/views/partials/admin/settings/notice.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@section('settings::notice')
- @if(config('panel.load_environment_only', false))
-
-
-
- Your Panel is currently configured to read settings from the environment only. You will need to set APP_ENVIRONMENT_ONLY=false in your environment file in order to load settings dynamically.
-
-
-
