From ed88ce9ae377414a318b2d8181663d4e8f614f80 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Thu, 3 Apr 2025 03:44:33 +0200 Subject: [PATCH] cleanup `panel` config file (#1198) --- app/Services/Servers/EnvironmentService.php | 8 -- config/panel.php | 127 -------------------- 2 files changed, 135 deletions(-) diff --git a/app/Services/Servers/EnvironmentService.php b/app/Services/Servers/EnvironmentService.php index 3979fa55c..686bbfcce 100644 --- a/app/Services/Servers/EnvironmentService.php +++ b/app/Services/Servers/EnvironmentService.php @@ -47,14 +47,6 @@ class EnvironmentService $variables->put($key, object_get($server, $object)); } - // Process variables set in the configuration file. - foreach (config('panel.environment_variables', []) as $key => $object) { - $variables->put( - $key, - is_callable($object) ? call_user_func($object, $server) : object_get($server, $object) - ); - } - // Process dynamically included environment variables. foreach ($this->additional as $key => $closure) { $variables->put($key, call_user_func($closure, $server)); diff --git a/config/panel.php b/config/panel.php index a42053a5d..b4ed78dbe 100644 --- a/config/panel.php +++ b/config/panel.php @@ -1,13 +1,6 @@ [ '2fa_required' => env('APP_2FA_REQUIRED', 0), @@ -18,65 +11,15 @@ return [ ], ], - /* - |-------------------------------------------------------------------------- - | Pagination - |-------------------------------------------------------------------------- - | - | Certain pagination result counts can be configured here and will take - | effect globally. - */ - - 'paginate' => [ - 'frontend' => [ - 'servers' => env('APP_PAGINATE_FRONT_SERVERS', 15), - ], - 'admin' => [ - 'servers' => env('APP_PAGINATE_ADMIN_SERVERS', 25), - 'users' => env('APP_PAGINATE_ADMIN_USERS', 25), - ], - 'api' => [ - 'nodes' => env('APP_PAGINATE_API_NODES', 25), - 'servers' => env('APP_PAGINATE_API_SERVERS', 25), - 'users' => env('APP_PAGINATE_API_USERS', 25), - ], - ], - - /* - |-------------------------------------------------------------------------- - | Guzzle Connections - |-------------------------------------------------------------------------- - | - | Configure the timeout to be used for Guzzle connections here. - */ - 'guzzle' => [ 'timeout' => env('GUZZLE_TIMEOUT', 15), 'connect_timeout' => env('GUZZLE_CONNECT_TIMEOUT', 5), ], - /* - |-------------------------------------------------------------------------- - | CDN - |-------------------------------------------------------------------------- - | - | Information for the panel to use when contacting the CDN to confirm - | if panel is up to date. - */ - 'cdn' => [ 'cache_time' => 60, - 'url' => 'https://cdn.pelican.dev/releases/latest.json', ], - /* - |-------------------------------------------------------------------------- - | Client Features - |-------------------------------------------------------------------------- - | - | Allow clients to turn features on or off - */ - 'client_features' => [ 'databases' => [ 'enabled' => env('PANEL_CLIENT_DATABASES_ENABLED', true), @@ -95,56 +38,10 @@ return [ ], ], - /* - |-------------------------------------------------------------------------- - | File Editor - |-------------------------------------------------------------------------- - | - | This array includes the MIME filetypes that can be edited via the web. - */ - 'files' => [ 'max_edit_size' => env('PANEL_FILES_MAX_EDIT_SIZE', 1024 * 1024 * 4), ], - /* - |-------------------------------------------------------------------------- - | Dynamic Environment Variables - |-------------------------------------------------------------------------- - | - | Place dynamic environment variables here that should be auto-appended - | to server environment fields when the server is created or updated. - | - | Items should be in 'key' => 'value' format, where key is the environment - | variable name, and value is the server-object key. For example: - | - | 'P_SERVER_CREATED_AT' => 'created_at' - */ - - 'environment_variables' => [ - 'P_SERVER_ALLOCATION_LIMIT' => 'allocation_limit', - ], - - /* - |-------------------------------------------------------------------------- - | Asset Verification - |-------------------------------------------------------------------------- - | - | This section controls the output format for JS & CSS assets. - */ - - 'assets' => [ - 'use_hash' => env('PANEL_USE_ASSET_HASH', false), - ], - - /* - |-------------------------------------------------------------------------- - | Email Notification Settings - |-------------------------------------------------------------------------- - | - | This section controls what notifications are sent to users. - */ - 'email' => [ // Should an email be sent to a server owner once their server has completed it's first install process? 'send_install_notification' => env('PANEL_SEND_INSTALL_NOTIFICATION', true), @@ -152,14 +49,6 @@ return [ 'send_reinstall_notification' => env('PANEL_SEND_REINSTALL_NOTIFICATION', true), ], - /* - |-------------------------------------------------------------------------- - | FilamentPHP Settings - |-------------------------------------------------------------------------- - | - | This section controls Filament configurations - */ - 'filament' => [ 'top-navigation' => env('FILAMENT_TOP_NAVIGATION', false), 'display-width' => env('FILAMENT_WIDTH', 'screen-2xl'), @@ -169,27 +58,11 @@ return [ 'editable_server_descriptions' => env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', true), - /* - |-------------------------------------------------------------------------- - | API Settings - |-------------------------------------------------------------------------- - | - | This section controls Api Key configurations - */ - 'api' => [ 'key_limit' => env('API_KEYS_LIMIT', 25), 'key_expire_time' => env('API_KEYS_EXPIRE_TIME', 720), ], - /* - |-------------------------------------------------------------------------- - | Webhook Settings - |-------------------------------------------------------------------------- - | - | This section controls Webhook configurations - */ - 'webhook' => [ 'prune_days' => env('APP_WEBHOOK_PRUNE_DAYS', 30), ],