Skip to content
This repository was archived by the owner on Feb 18, 2023. It is now read-only.

Commit 1377ce1

Browse files
committed
Updating config files according to current status of Laravel 6
1 parent 62b7bc5 commit 1377ce1

File tree

6 files changed

+50
-25
lines changed

6 files changed

+50
-25
lines changed

config/database.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@
112112
|
113113
*/
114114
'redis' => [
115-
'client' => env('REDIS_CLIENT', 'predis'),
115+
'client' => env('REDIS_CLIENT', 'phpredis'),
116116
'options' => [
117-
'cluster' => env('REDIS_CLUSTER', 'predis'),
117+
'cluster' => env('REDIS_CLUSTER', 'redis'),
118118
'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
119119
],
120120
'default' => [

config/filesystems.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
| may even configure multiple disks of the same driver. Defaults have
3232
| been setup for each driver as an example of the required options.
3333
|
34-
| Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
34+
| Supported Drivers: "local", "ftp", "sftp", "s3"
3535
|
3636
*/
3737
'disks' => [
@@ -54,4 +54,4 @@
5454
'url' => env('AWS_URL'),
5555
],
5656
],
57-
];
57+
];

config/logging.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22

3+
use Monolog\Handler\NullHandler;
34
use Monolog\Handler\StreamHandler;
45
use Monolog\Handler\SyslogUdpHandler;
56

67
return [
8+
79
/*
810
|--------------------------------------------------------------------------
911
| Default Log Channel
@@ -14,7 +16,9 @@
1416
| one of the channels defined in the "channels" configuration array.
1517
|
1618
*/
19+
1720
'default' => env('LOG_CHANNEL', 'stack'),
21+
1822
/*
1923
|--------------------------------------------------------------------------
2024
| Log Channels
@@ -29,30 +33,35 @@
2933
| "custom", "stack"
3034
|
3135
*/
36+
3237
'channels' => [
3338
'stack' => [
3439
'driver' => 'stack',
3540
'channels' => ['daily'],
3641
'ignore_exceptions' => false,
3742
],
43+
3844
'single' => [
3945
'driver' => 'single',
4046
'path' => storage_path('logs/laravel.log'),
4147
'level' => 'debug',
4248
],
49+
4350
'daily' => [
4451
'driver' => 'daily',
4552
'path' => storage_path('logs/laravel.log'),
4653
'level' => 'debug',
4754
'days' => 14,
4855
],
56+
4957
'slack' => [
5058
'driver' => 'slack',
5159
'url' => env('LOG_SLACK_WEBHOOK_URL'),
5260
'username' => 'Laravel Log',
5361
'emoji' => ':boom:',
5462
'level' => 'critical',
5563
],
64+
5665
'papertrail' => [
5766
'driver' => 'monolog',
5867
'level' => 'debug',
@@ -62,6 +71,7 @@
6271
'port' => env('PAPERTRAIL_PORT'),
6372
],
6473
],
74+
6575
'stderr' => [
6676
'driver' => 'monolog',
6777
'handler' => StreamHandler::class,
@@ -70,13 +80,21 @@
7080
'stream' => 'php://stderr',
7181
],
7282
],
83+
7384
'syslog' => [
7485
'driver' => 'syslog',
7586
'level' => 'debug',
7687
],
88+
7789
'errorlog' => [
7890
'driver' => 'errorlog',
7991
'level' => 'debug',
8092
],
93+
94+
'null' => [
95+
'driver' => 'monolog',
96+
'handler' => NullHandler::class,
97+
],
8198
],
82-
];
99+
100+
];

config/mail.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
| sending of e-mail. You may specify which one you're using throughout
1111
| your application here. By default, Laravel is setup for SMTP mail.
1212
|
13-
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
14-
| "sparkpost", "postmark", "log", "array"
13+
| Supported: "smtp", "sendmail", "mailgun", "ses",
14+
| "postmark", "log", "array"
1515
|
1616
*/
1717
'driver' => env('MAIL_DRIVER', 'smtp'),
@@ -112,4 +112,4 @@
112112
|
113113
*/
114114
'log_channel' => env('MAIL_LOG_CHANNEL'),
115-
];
115+
];

config/queue.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
return [
4+
45
/*
56
|--------------------------------------------------------------------------
67
| Default Queue Connection Name
@@ -11,7 +12,9 @@
1112
| syntax for every one. Here you may define a default connection.
1213
|
1314
*/
15+
1416
'default' => env('QUEUE_CONNECTION', 'sync'),
17+
1518
/*
1619
|--------------------------------------------------------------------------
1720
| Queue Connections
@@ -24,23 +27,28 @@
2427
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
2528
|
2629
*/
30+
2731
'connections' => [
32+
2833
'sync' => [
2934
'driver' => 'sync',
3035
],
36+
3137
'database' => [
3238
'driver' => 'database',
3339
'table' => 'jobs',
3440
'queue' => 'default',
3541
'retry_after' => 90,
3642
],
43+
3744
'beanstalkd' => [
3845
'driver' => 'beanstalkd',
3946
'host' => 'localhost',
4047
'queue' => 'default',
4148
'retry_after' => 90,
4249
'block_for' => 0,
4350
],
51+
4452
'sqs' => [
4553
'driver' => 'sqs',
4654
'key' => env('AWS_ACCESS_KEY_ID'),
@@ -49,14 +57,17 @@
4957
'queue' => env('SQS_QUEUE', 'your-queue-name'),
5058
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
5159
],
60+
5261
'redis' => [
5362
'driver' => 'redis',
5463
'connection' => 'default',
5564
'queue' => env('REDIS_QUEUE', 'default'),
5665
'retry_after' => 90,
5766
'block_for' => null,
5867
],
68+
5969
],
70+
6071
/*
6172
|--------------------------------------------------------------------------
6273
| Failed Queue Jobs
@@ -67,8 +78,11 @@
6778
| have failed. You may change them to any database / table you wish.
6879
|
6980
*/
81+
7082
'failed' => [
83+
'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
7184
'database' => env('DB_CONNECTION', 'mysql'),
7285
'table' => 'failed_jobs',
7386
],
74-
];
87+
88+
];

config/services.php

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
11
<?php
22

33
return [
4+
45
/*
56
|--------------------------------------------------------------------------
67
| Third Party Services
78
|--------------------------------------------------------------------------
89
|
910
| This file is for storing the credentials for third party services such
10-
| as Stripe, Mailgun, SparkPost and others. This file provides a sane
11-
| default location for this type of information, allowing packages
12-
| to have a conventional place to find your various credentials.
11+
| as Mailgun, Postmark, AWS and more. This file provides the de facto
12+
| location for this type of information, allowing packages to have
13+
| a conventional file to locate the various service credentials.
1314
|
1415
*/
16+
1517
'mailgun' => [
1618
'domain' => env('MAILGUN_DOMAIN'),
1719
'secret' => env('MAILGUN_SECRET'),
1820
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
1921
],
22+
2023
'postmark' => [
2124
'token' => env('POSTMARK_TOKEN'),
2225
],
26+
2327
'ses' => [
2428
'key' => env('AWS_ACCESS_KEY_ID'),
2529
'secret' => env('AWS_SECRET_ACCESS_KEY'),
2630
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
2731
],
28-
'sparkpost' => [
29-
'secret' => env('SPARKPOST_SECRET'),
30-
],
31-
'stripe' => [
32-
'model' => App\Entities\User::class,
33-
'key' => env('STRIPE_KEY'),
34-
'secret' => env('STRIPE_SECRET'),
35-
'webhook' => [
36-
'secret' => env('STRIPE_WEBHOOK_SECRET'),
37-
'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
38-
],
39-
],
40-
];
32+
33+
];

0 commit comments

Comments
 (0)