Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.0-develop' into develop

Browse source
This commit is contained in:
Matthew Penner 2022-12-12 16:23:11 -07:00
commit 4138fb7497
No known key found for this signature in database
14 changed files with 149 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/mail.php
View file

@ -41,7 +41,7 @@ return [
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
'timeout' => null,
'local_domain' => env('MAIL_EHLO_DOMAIN'),
'local_domain' => env('MAIL_EHLO_DOMAIN', env('SERVER_NAME')),
],
'ses' => [

6
config/queue.php
View file

@ -33,7 +33,7 @@ return [
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => env('QUEUE_STANDARD', 'default'),
'queue' => env('QUEUE_STANDARD', 'standard'),
'retry_after' => 90,
'after_commit' => false,
],
@ -43,7 +43,7 @@ return [
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', env('QUEUE_STANDARD', 'default')),
'queue' => env('SQS_QUEUE', env('QUEUE_STANDARD', 'standard')),
'suffix' => env('SQS_SUFFIX'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'after_commit' => false,
@ -52,7 +52,7 @@ return [
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => env('REDIS_QUEUE', env('QUEUE_STANDARD', 'default')),
'queue' => env('REDIS_QUEUE', env('QUEUE_STANDARD', 'standard')),
'retry_after' => 90,
'block_for' => null,
'after_commit' => false,