diff --git a/.env.example b/.env.example index 040d328e2..10b0cc1bd 100644 --- a/.env.example +++ b/.env.example @@ -196,28 +196,6 @@ COVERS_PATH=/var/www/nntmux/public/covers/ ASSET_URL= -TELESCOPE_DRIVER=database -TELESCOPE_ENABLED=false -TELESCOPE_FULL_IN_PRODUCTION=false -TELESCOPE_CACHE_WATCHER=true -TELESCOPE_COMMAND_WATCHER=true -TELESCOPE_DUMP_WATCHER=true -TELESCOPE_EVENT_WATCHER=true -TELESCOPE_EXCEPTION_WATCHER=true -TELESCOPE_JOB_WATCHER=true -TELESCOPE_LOG_WATCHER=true -TELESCOPE_MAIL_WATCHER=true -TELESCOPE_MODEL_WATCHER=true -TELESCOPE_NOTIFICATION_WATCHER=true -TELESCOPE_QUERY_WATCHER=true -TELESCOPE_REDIS_WATCHER=true -TELESCOPE_REQUEST_WATCHER=true -TELESCOPE_RESPONSE_SIZE_LIMIT=64 -TELESCOPE_GATE_WATCHER=true -TELESCOPE_SCHEDULE_WATCHER=true - -HORIZON_PREFIX=horizon: - POSTMARK_TOKEN= PURGE_INACTIVE_USERS=false diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php deleted file mode 100644 index b97bda176..000000000 --- a/app/Providers/HorizonServiceProvider.php +++ /dev/null @@ -1,46 +0,0 @@ -email, [ - config('nntmux.admin_email'), - ], true); - }); - } - - /** - * Register any application services. - */ - public function register(): void - { - // - } -} diff --git a/app/Providers/TelescopeServiceProvider.php b/app/Providers/TelescopeServiceProvider.php deleted file mode 100644 index 88b69924e..000000000 --- a/app/Providers/TelescopeServiceProvider.php +++ /dev/null @@ -1,66 +0,0 @@ -hideSensitiveRequestDetails(); - - Telescope::filter(function (IncomingEntry $entry) { - if ($this->app->isLocal() || config('telescope.full_enabled_in_production') === true) { - return true; - } - - return $entry->isReportableException() || - $entry->isFailedJob() || - $entry->isScheduledTask() || - $entry->hasMonitoredTag(); - }); - } - - /** - * Prevent sensitive request details from being logged by Telescope. - */ - protected function hideSensitiveRequestDetails(): void - { - if ($this->app->isLocal()) { - return; - } - - Telescope::hideRequestParameters(['_token']); - - Telescope::hideRequestHeaders([ - 'cookie', - 'x-csrf-token', - 'x-xsrf-token', - ]); - } - - /** - * Register the Telescope gate. - * - * This gate determines who can access Telescope in non-local environments. - */ - protected function gate(): void - { - Gate::define('viewTelescope', function ($user) { - return in_array($user->email, [ - config('nntmux.admin_email'), - ], true); - }); - } -} diff --git a/bootstrap/providers.php b/bootstrap/providers.php index a06762558..a877118bc 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -5,10 +5,8 @@ return [ App\Providers\AppServiceProvider::class, App\Providers\CategorizationServiceProvider::class, App\Providers\ForumServiceProvider::class, - App\Providers\HorizonServiceProvider::class, App\Providers\ProcessingServiceProvider::class, App\Providers\RouteServiceProvider::class, - App\Providers\TelescopeServiceProvider::class, App\Providers\TvProcessingServiceProvider::class, App\Providers\UserServiceProvider::class, App\Providers\VoltServiceProvider::class, diff --git a/composer.json b/composer.json index 8f6a43596..a8880a60e 100644 --- a/composer.json +++ b/composer.json @@ -59,14 +59,10 @@ "intervention/image": "^3.11", "jrean/laravel-user-verification": "^13.0", "laravel/framework": "^12.28", - "laravel/horizon": "^5.31", "laravel/pulse": "^1.4", "laravel/sanctum": "^4.0", "laravel/scout": "^10.13", - "laravel/telescope": "^5.5", "laravel/tinker": "^2.10.1", - "laravel/ui": "^4.6", - "leventcz/laravel-top": "^1.2", "livewire/blaze": "^1.0", "livewire/livewire": "^3.6", "livewire/volt": "^1.6", diff --git a/composer.lock b/composer.lock index a6e689e0d..9ce16ad8a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "33b9f513d720b31bdc04e4418556fc2d", + "content-hash": "8de687f72473f4ec9902d492ff625378", "packages": [ { "name": "aharen/omdbapi", @@ -2839,86 +2839,6 @@ }, "time": "2026-02-24T14:35:15+00:00" }, - { - "name": "laravel/horizon", - "version": "v5.45.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/horizon.git", - "reference": "7126ddf27fe9750c43ab0b567085dee3917d0510" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/7126ddf27fe9750c43ab0b567085dee3917d0510", - "reference": "7126ddf27fe9750c43ab0b567085dee3917d0510", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pcntl": "*", - "ext-posix": "*", - "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0|^13.0", - "illuminate/queue": "^9.21|^10.0|^11.0|^12.0|^13.0", - "illuminate/support": "^9.21|^10.0|^11.0|^12.0|^13.0", - "laravel/sentinel": "^1.0", - "nesbot/carbon": "^2.17|^3.0", - "php": "^8.0", - "ramsey/uuid": "^4.0", - "symfony/console": "^6.0|^7.0|^8.0", - "symfony/error-handler": "^6.0|^7.0|^8.0", - "symfony/polyfill-php83": "^1.28", - "symfony/process": "^6.0|^7.0|^8.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "orchestra/testbench": "^7.56|^8.37|^9.16|^10.9|^11.0", - "phpstan/phpstan": "^1.10|^2.0", - "predis/predis": "^1.1|^2.0|^3.0" - }, - "suggest": { - "ext-redis": "Required to use the Redis PHP driver.", - "predis/predis": "Required when not using the Redis PHP driver (^1.1|^2.0|^3.0)." - }, - "type": "library", - "extra": { - "laravel": { - "aliases": { - "Horizon": "Laravel\\Horizon\\Horizon" - }, - "providers": [ - "Laravel\\Horizon\\HorizonServiceProvider" - ] - }, - "branch-alias": { - "dev-master": "6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Laravel\\Horizon\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Dashboard and code-driven configuration for Laravel queues.", - "keywords": [ - "laravel", - "queue" - ], - "support": { - "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.45.0" - }, - "time": "2026-02-21T14:20:09+00:00" - }, { "name": "laravel/prompts", "version": "v0.3.13", @@ -3329,75 +3249,6 @@ }, "time": "2026-02-20T19:59:49+00:00" }, - { - "name": "laravel/telescope", - "version": "5.18.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/telescope.git", - "reference": "8bbc1d839317cef7106cabf028e407416e5a1dad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/8bbc1d839317cef7106cabf028e407416e5a1dad", - "reference": "8bbc1d839317cef7106cabf028e407416e5a1dad", - "shasum": "" - }, - "require": { - "ext-json": "*", - "laravel/framework": "^8.37|^9.0|^10.0|^11.0|^12.0|^13.0", - "laravel/sentinel": "^1.0", - "php": "^8.0", - "symfony/console": "^5.3|^6.0|^7.0", - "symfony/var-dumper": "^5.0|^6.0|^7.0" - }, - "require-dev": { - "ext-gd": "*", - "guzzlehttp/guzzle": "^6.0|^7.0", - "laravel/octane": "^1.4|^2.0", - "orchestra/testbench": "^6.47.1|^7.55|^8.36|^9.15|^10.8|^11.0", - "phpstan/phpstan": "^1.10" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Laravel\\Telescope\\TelescopeServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Laravel\\Telescope\\": "src/", - "Laravel\\Telescope\\Database\\Factories\\": "database/factories/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - }, - { - "name": "Mohamed Said", - "email": "mohamed@laravel.com" - } - ], - "description": "An elegant debug assistant for the Laravel framework.", - "keywords": [ - "debugging", - "laravel", - "monitoring" - ], - "support": { - "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/5.18.0" - }, - "time": "2026-02-20T19:55:06+00:00" - }, { "name": "laravel/tinker", "version": "v2.11.1", @@ -3464,69 +3315,6 @@ }, "time": "2026-02-06T14:12:35+00:00" }, - { - "name": "laravel/ui", - "version": "v4.6.1", - "source": { - "type": "git", - "url": "https://github.com/laravel/ui.git", - "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/7d6ffa38d79f19c9b3e70a751a9af845e8f41d88", - "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88", - "shasum": "" - }, - "require": { - "illuminate/console": "^9.21|^10.0|^11.0|^12.0", - "illuminate/filesystem": "^9.21|^10.0|^11.0|^12.0", - "illuminate/support": "^9.21|^10.0|^11.0|^12.0", - "illuminate/validation": "^9.21|^10.0|^11.0|^12.0", - "php": "^8.0", - "symfony/console": "^6.0|^7.0" - }, - "require-dev": { - "orchestra/testbench": "^7.35|^8.15|^9.0|^10.0", - "phpunit/phpunit": "^9.3|^10.4|^11.5" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Laravel\\Ui\\UiServiceProvider" - ] - }, - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "Laravel\\Ui\\": "src/", - "Illuminate\\Foundation\\Auth\\": "auth-backend/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Laravel UI utilities and presets.", - "keywords": [ - "laravel", - "ui" - ], - "support": { - "source": "https://github.com/laravel/ui/tree/v4.6.1" - }, - "time": "2025-01-28T15:15:29+00:00" - }, { "name": "league/commonmark", "version": "2.8.0", @@ -4202,75 +3990,6 @@ ], "time": "2026-01-15T06:54:53+00:00" }, - { - "name": "leventcz/laravel-top", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/leventcz/laravel-top.git", - "reference": "a352fab4770200bcb5224cc9649e8af2828db965" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/leventcz/laravel-top/zipball/a352fab4770200bcb5224cc9649e8af2828db965", - "reference": "a352fab4770200bcb5224cc9649e8af2828db965", - "shasum": "" - }, - "require": { - "ext-pcntl": "*", - "laravel/framework": "^10.0|^11.0|^12.0", - "php": "^8.2.0", - "react/event-loop": "^1.5" - }, - "require-dev": { - "laravel/pint": "^1.15", - "mockery/mockery": "^1.6", - "pestphp/pest": "^2.34|^3.7", - "phpstan/phpstan": "^1.10|^2.1" - }, - "type": "library", - "extra": { - "laravel": { - "aliases": { - "Top": "Leventcz\\Top\\Facades\\Top" - }, - "providers": [ - "Leventcz\\Top\\ServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Leventcz\\Top\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Levent Corapsiz", - "email": "l.corapsiz@gmail.com" - } - ], - "description": "Real-time monitoring straight from the command line for Laravel applications.", - "homepage": "https://github.com/leventcz/laravel-top", - "keywords": [ - "Metrics", - "apm", - "cli", - "command-line-tool", - "laravel", - "php", - "realtime-monitoring" - ], - "support": { - "issues": "https://github.com/leventcz/laravel-top/issues", - "source": "https://github.com/leventcz/laravel-top/tree/v1.2.0" - }, - "time": "2025-03-02T22:07:29+00:00" - }, { "name": "livewire/blaze", "version": "v1.0.2", @@ -7224,78 +6943,6 @@ }, "time": "2025-12-14T04:43:48+00:00" }, - { - "name": "react/event-loop", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/reactphp/event-loop.git", - "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a", - "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" - }, - "suggest": { - "ext-pcntl": "For signal handling support when using the StreamSelectLoop" - }, - "type": "library", - "autoload": { - "psr-4": { - "React\\EventLoop\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christian Lück", - "email": "christian@clue.engineering", - "homepage": "https://clue.engineering/" - }, - { - "name": "Cees-Jan Kiewiet", - "email": "reactphp@ceesjankiewiet.nl", - "homepage": "https://wyrihaximus.net/" - }, - { - "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com", - "homepage": "https://sorgalla.com/" - }, - { - "name": "Chris Boden", - "email": "cboden@gmail.com", - "homepage": "https://cboden.dev/" - } - ], - "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", - "keywords": [ - "asynchronous", - "event-loop" - ], - "support": { - "issues": "https://github.com/reactphp/event-loop/issues", - "source": "https://github.com/reactphp/event-loop/tree/v1.6.0" - }, - "funding": [ - { - "url": "https://opencollective.com/reactphp", - "type": "open_collective" - } - ], - "time": "2025-11-17T20:46:25+00:00" - }, { "name": "react/promise", "version": "v3.3.0", @@ -12733,16 +12380,16 @@ }, { "name": "captainhook/captainhook", - "version": "5.28.3", + "version": "5.28.4", "source": { "type": "git", "url": "https://github.com/captainhook-git/captainhook.git", - "reference": "5d35b249f3843ef36ead119f4347e649278ad6d8" + "reference": "9cf7e17c1f74e9aa3bbf5b394ae86510be503a91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/captainhook-git/captainhook/zipball/5d35b249f3843ef36ead119f4347e649278ad6d8", - "reference": "5d35b249f3843ef36ead119f4347e649278ad6d8", + "url": "https://api.github.com/repos/captainhook-git/captainhook/zipball/9cf7e17c1f74e9aa3bbf5b394ae86510be503a91", + "reference": "9cf7e17c1f74e9aa3bbf5b394ae86510be503a91", "shasum": "" }, "require": { @@ -12805,7 +12452,7 @@ ], "support": { "issues": "https://github.com/captainhook-git/captainhook/issues", - "source": "https://github.com/captainhook-git/captainhook/tree/5.28.3" + "source": "https://github.com/captainhook-git/captainhook/tree/5.28.4" }, "funding": [ { @@ -12813,7 +12460,7 @@ "type": "github" } ], - "time": "2026-02-16T14:08:58+00:00" + "time": "2026-02-27T11:47:08+00:00" }, { "name": "captainhook/plugin-composer", @@ -14251,40 +13898,40 @@ }, { "name": "larastan/larastan", - "version": "v3.9.2", + "version": "v3.9.3", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "2e9ed291bdc1969e7f270fb33c9cdf3c912daeb2" + "reference": "64a52bcc5347c89fdf131cb59f96ebfbc8d1ad65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/2e9ed291bdc1969e7f270fb33c9cdf3c912daeb2", - "reference": "2e9ed291bdc1969e7f270fb33c9cdf3c912daeb2", + "url": "https://api.github.com/repos/larastan/larastan/zipball/64a52bcc5347c89fdf131cb59f96ebfbc8d1ad65", + "reference": "64a52bcc5347c89fdf131cb59f96ebfbc8d1ad65", "shasum": "" }, "require": { "ext-json": "*", "iamcal/sql-parser": "^0.7.0", - "illuminate/console": "^11.44.2 || ^12.4.1", - "illuminate/container": "^11.44.2 || ^12.4.1", - "illuminate/contracts": "^11.44.2 || ^12.4.1", - "illuminate/database": "^11.44.2 || ^12.4.1", - "illuminate/http": "^11.44.2 || ^12.4.1", - "illuminate/pipeline": "^11.44.2 || ^12.4.1", - "illuminate/support": "^11.44.2 || ^12.4.1", + "illuminate/console": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/container": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/contracts": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/database": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/http": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/pipeline": "^11.44.2 || ^12.4.1 || ^13", + "illuminate/support": "^11.44.2 || ^12.4.1 || ^13", "php": "^8.2", "phpstan/phpstan": "^2.1.32" }, "require-dev": { "doctrine/coding-standard": "^13", - "laravel/framework": "^11.44.2 || ^12.7.2", + "laravel/framework": "^11.44.2 || ^12.7.2 || ^13", "mockery/mockery": "^1.6.12", "nikic/php-parser": "^5.4", - "orchestra/canvas": "^v9.2.2 || ^10.0.1", - "orchestra/testbench-core": "^9.12.0 || ^10.1", + "orchestra/canvas": "^v9.2.2 || ^10.0.1 || ^11", + "orchestra/testbench-core": "^9.12.0 || ^10.1 || ^11", "phpstan/phpstan-deprecation-rules": "^2.0.1", - "phpunit/phpunit": "^10.5.35 || ^11.5.15" + "phpunit/phpunit": "^10.5.35 || ^11.5.15 || ^12.5.8" }, "suggest": { "orchestra/testbench": "Using Larastan for analysing a package needs Testbench", @@ -14329,7 +13976,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v3.9.2" + "source": "https://github.com/larastan/larastan/tree/v3.9.3" }, "funding": [ { @@ -14337,7 +13984,7 @@ "type": "github" } ], - "time": "2026-01-30T15:16:32+00:00" + "time": "2026-02-20T12:07:12+00:00" }, { "name": "laravel/boost", @@ -15965,6 +15612,78 @@ ], "time": "2025-11-18T19:34:28+00:00" }, + { + "name": "react/event-loop", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/event-loop.git", + "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a", + "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + }, + "suggest": { + "ext-pcntl": "For signal handling support when using the StreamSelectLoop" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\EventLoop\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", + "keywords": [ + "asynchronous", + "event-loop" + ], + "support": { + "issues": "https://github.com/reactphp/event-loop/issues", + "source": "https://github.com/reactphp/event-loop/tree/v1.6.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2025-11-17T20:46:25+00:00" + }, { "name": "react/socket", "version": "v1.17.0", diff --git a/config/horizon.php b/config/horizon.php deleted file mode 100644 index 2b0ee8638..000000000 --- a/config/horizon.php +++ /dev/null @@ -1,212 +0,0 @@ - 'default', - - /* - |-------------------------------------------------------------------------- - | Horizon Redis Prefix - |-------------------------------------------------------------------------- - | - | This prefix will be used when storing all Horizon data in Redis. You - | may modify the prefix when you are running multiple installations - | of Horizon on the same server so that they don't have problems. - | - */ - - 'prefix' => env('HORIZON_PREFIX', 'horizon:'), - - /* - |-------------------------------------------------------------------------- - | Horizon Route Middleware - |-------------------------------------------------------------------------- - | - | These middleware will get attached onto each Horizon route, giving you - | the chance to add your own middleware to this list or change any of - | the existing middleware. Or, you can simply stick with this list. - | - */ - - 'middleware' => ['web'], - - /* - |-------------------------------------------------------------------------- - | Queue Wait Time Thresholds - |-------------------------------------------------------------------------- - | - | This option allows you to configure when the LongWaitDetected event - | will be fired. Every connection / queue combination may have its - | own, unique threshold (in seconds) before this event is fired. - | - */ - - 'waits' => [ - 'redis:default' => 60, - ], - - /* - |-------------------------------------------------------------------------- - | Job Trimming Times - |-------------------------------------------------------------------------- - | - | Here you can configure for how long (in minutes) you desire Horizon to - | persist the recent and failed jobs. Typically, recent jobs are kept - | for one hour while all failed jobs are stored for an entire week. - | - */ - - 'trim' => [ - 'recent' => 60, - 'failed' => 10080, - 'monitored' => 10080, - ], - - /* - |-------------------------------------------------------------------------- - | Fast Termination - |-------------------------------------------------------------------------- - | - | When this option is enabled, Horizon's "terminate" command will not - | wait on all of the workers to terminate unless the --wait option - | is provided. Fast termination can shorten deployment delay by - | allowing a new instance of Horizon to start while the last - | instance will continue to terminate each of its workers. - | - */ - - 'fast_termination' => true, - - /* - |-------------------------------------------------------------------------- - | Memory Limit (MB) - |-------------------------------------------------------------------------- - | - | This value describes the maximum amount of memory the Horizon worker - | may consume before it is terminated and restarted. You should set - | this value according to the resources available to your server. - | - */ - - 'memory_limit' => 64, - - /* - |-------------------------------------------------------------------------- - | Queue Worker Configuration - |-------------------------------------------------------------------------- - | - | Here you may define the queue worker settings used by your application - | in all environments. These supervisors and settings handle all your - | queued jobs and will be provisioned by Horizon during deployment. - | - */ - - 'environments' => [ - 'production' => [ - 'supervisor-1' => [ - 'connection' => 'redis', - 'queue' => ['default'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - 'supervisor-2' => [ - 'connection' => 'redis', - 'queue' => ['emails'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - 'supervisor-3' => [ - 'connection' => 'redis', - 'queue' => ['newreg'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - 'supervisor-4' => [ - 'connection' => 'redis', - 'queue' => ['welcomeemails'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - 'supervisor-5' => [ - 'connection' => 'redis', - 'queue' => ['contactemail'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - 'supervisor-6' => [ - 'connection' => 'redis', - 'queue' => ['deleted'], - 'balance' => 'auto', - 'minProcesses' => 3, - 'maxProcesses' => 8, - 'tries' => 3, - ], - ], - - 'local' => [ - 'supervisor-1' => [ - 'connection' => 'redis', - 'queue' => ['default'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - 'supervisor-2' => [ - 'connection' => 'redis', - 'queue' => ['emails'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - 'supervisor-3' => [ - 'connection' => 'redis', - 'queue' => ['newreg'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - 'supervisor-4' => [ - 'connection' => 'redis', - 'queue' => ['welcomeemails'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - 'supervisor-5' => [ - 'connection' => 'redis', - 'queue' => ['contactemail'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - 'supervisor-6' => [ - 'connection' => 'redis', - 'queue' => ['deleted'], - 'balance' => 'auto', - 'processes' => 3, - 'tries' => 3, - ], - ], - ], -]; diff --git a/config/pulse.php b/config/pulse.php index 79e09c876..3c686f9f9 100644 --- a/config/pulse.php +++ b/config/pulse.php @@ -133,7 +133,6 @@ return [ 'ignore' => [ '/^laravel:pulse:/', // Internal Pulse keys... '/^illuminate:/', // Internal Laravel keys... - '/^telescope:/', // Internal Telescope keys... '/^nova/', // Internal Nova keys... '/^.+@.+\|(?:(?:\d+\.\d+\.\d+\.\d+)|[0-9a-fA-F:]+)(?::timer)?$/', // Breeze / Jetstream authentication rate limiting... '/^[a-zA-Z0-9]{40}$/', // Session IDs... diff --git a/config/telescope.php b/config/telescope.php deleted file mode 100644 index b2db8d8ef..000000000 --- a/config/telescope.php +++ /dev/null @@ -1,132 +0,0 @@ - 'telescope', - - /* - |-------------------------------------------------------------------------- - | Telescope Storage Driver - |-------------------------------------------------------------------------- - | - | This configuration options determines the storage driver that will - | be used to store Telescope's data. In addition, you may set any - | custom options as needed by the particular driver you choose. - | - */ - - 'driver' => env('TELESCOPE_DRIVER', 'database'), - - 'storage' => [ - 'database' => [ - 'connection' => env('DB_CONNECTION', 'mysql'), - ], - ], - - /* - |-------------------------------------------------------------------------- - | Telescope Master Switch - |-------------------------------------------------------------------------- - | - | This option may be used to disable all Telescope watchers regardless - | of their individual configuration, which simply provides a single - | and convenient way to enable or disable Telescope data storage. - | - */ - - 'enabled' => env('TELESCOPE_ENABLED', true), - 'full_enabled_in_production' => env('TELESCOPE_FULL_IN_PRODUCTION', false), - - /* - |-------------------------------------------------------------------------- - | Telescope Route Middleware - |-------------------------------------------------------------------------- - | - | These middleware will be assigned to every Telescope route, giving you - | the chance to add your own middleware to this list or change any of - | the existing middleware. Or, you can simply stick with this list. - | - */ - - 'middleware' => [ - 'web', - Authorize::class, - ], - - /* - |-------------------------------------------------------------------------- - | Ignored Paths & Commands - |-------------------------------------------------------------------------- - | - | The following array lists the URI paths and Artisan commands that will - | not be watched by Telescope. In addition to this list, some Laravel - | commands, like migrations and queue commands, are always ignored. - | - */ - - 'ignore_paths' => [ - // - ], - - 'ignore_commands' => [ - // - ], - - /* - |-------------------------------------------------------------------------- - | Telescope Watchers - |-------------------------------------------------------------------------- - | - | The following array lists the "watchers" that will be registered with - | Telescope. The watchers gather the application's profile data when - | a request or task is executed. Feel free to customize this list. - | - */ - - 'watchers' => [ - Watchers\CacheWatcher::class => env('TELESCOPE_CACHE_WATCHER', true), - - Watchers\CommandWatcher::class => [ - 'enabled' => env('TELESCOPE_COMMAND_WATCHER', true), - 'ignore' => [], - ], - - Watchers\DumpWatcher::class => env('TELESCOPE_DUMP_WATCHER', true), - Watchers\EventWatcher::class => env('TELESCOPE_EVENT_WATCHER', true), - Watchers\ExceptionWatcher::class => env('TELESCOPE_EXCEPTION_WATCHER', true), - Watchers\JobWatcher::class => env('TELESCOPE_JOB_WATCHER', true), - Watchers\LogWatcher::class => env('TELESCOPE_LOG_WATCHER', true), - Watchers\MailWatcher::class => env('TELESCOPE_MAIL_WATCHER', true), - - Watchers\ModelWatcher::class => [ - 'enabled' => env('TELESCOPE_MODEL_WATCHER', true), - 'events' => ['eloquent.*'], - ], - - Watchers\NotificationWatcher::class => env('TELESCOPE_NOTIFICATION_WATCHER', true), - - Watchers\QueryWatcher::class => [ - 'enabled' => env('TELESCOPE_QUERY_WATCHER', true), - 'ignore_packages' => true, - 'slow' => 100, - ], - - Watchers\RedisWatcher::class => env('TELESCOPE_REDIS_WATCHER', true), - - Watchers\RequestWatcher::class => [ - 'enabled' => env('TELESCOPE_REQUEST_WATCHER', true), - 'size_limit' => env('TELESCOPE_RESPONSE_SIZE_LIMIT', 64), - ], - - Watchers\GateWatcher::class => [ - 'enabled' => env('TELESCOPE_GATE_WATCHER', true), - 'ignore_abilities' => [], - 'ignore_packages' => true, - ], - - Watchers\ScheduleWatcher::class => env('TELESCOPE_SCHEDULE_WATCHER', true), - ], -]; diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 12f232014..a7965ca2d 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -94,7 +94,7 @@