Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.

Commit abefe78

Browse files
committed
update the config files
1 parent c1fdef9 commit abefe78

File tree

11 files changed

+51
-95
lines changed

11 files changed

+51
-95
lines changed

config/app.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| any other location as required by the application or its packages.
1313
*/
1414

15-
'name' => 'My Application',
15+
'name' => 'Laravel',
1616

1717
/*
1818
|--------------------------------------------------------------------------
@@ -166,20 +166,17 @@
166166
/*
167167
* Package Service Providers...
168168
*/
169-
170-
//
169+
Laravel\Tinker\TinkerServiceProvider::class,
171170

172171
/*
173172
* Application Service Providers...
174173
*/
175174
Framework\Providers\AppServiceProvider::class,
176-
// Framework\Providers\BroadcastServiceProvider::class,
177175
Framework\Providers\AuthServiceProvider::class,
176+
// Framework\Providers\BroadcastServiceProvider::class,
178177
Framework\Providers\EventServiceProvider::class,
179178
Framework\Providers\RouteServiceProvider::class,
180179

181-
App\Foundation\ServiceProvider::class,
182-
Lucid\Console\LucidServiceProvider::class,
183180
],
184181

185182
/*
@@ -199,6 +196,8 @@
199196
'Artisan' => Illuminate\Support\Facades\Artisan::class,
200197
'Auth' => Illuminate\Support\Facades\Auth::class,
201198
'Blade' => Illuminate\Support\Facades\Blade::class,
199+
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
200+
'Bus' => Illuminate\Support\Facades\Bus::class,
202201
'Cache' => Illuminate\Support\Facades\Cache::class,
203202
'Config' => Illuminate\Support\Facades\Config::class,
204203
'Cookie' => Illuminate\Support\Facades\Cookie::class,

config/auth.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
'providers' => [
6868
'users' => [
6969
'driver' => 'eloquent',
70-
'model' => Framework\User::class,
70+
'model' => App\User::class,
7171
],
7272

7373
// 'users' => [
@@ -81,10 +81,6 @@
8181
| Resetting Passwords
8282
|--------------------------------------------------------------------------
8383
|
84-
| Here you may set the options for resetting passwords including the view
85-
| that is your password reset e-mail. You may also set the name of the
86-
| table that maintains all of the reset tokens for your application.
87-
|
8884
| You may specify multiple password reset configurations if you have more
8985
| than one user table or model in the application and you want to have
9086
| separate password reset settings based on the specific user types.

config/broadcasting.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
'pusher' => [
3434
'driver' => 'pusher',
35-
'key' => env('PUSHER_KEY'),
36-
'secret' => env('PUSHER_SECRET'),
35+
'key' => env('PUSHER_APP_KEY'),
36+
'secret' => env('PUSHER_APP_SECRET'),
3737
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
3939
//

config/cache.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646

4747
'file' => [
4848
'driver' => 'file',
49-
'path' => storage_path('framework/cache'),
49+
'path' => storage_path('framework/cache/data'),
5050
],
5151

5252
'memcached' => [
5353
'driver' => 'memcached',
5454
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
55-
'sasl' => [
55+
'sasl' => [
5656
env('MEMCACHED_USERNAME'),
5757
env('MEMCACHED_PASSWORD'),
5858
],
59-
'options' => [
59+
'options' => [
6060
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
6161
],
6262
'servers' => [

config/compile.php

Lines changed: 0 additions & 35 deletions
This file was deleted.

config/database.php

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
return [
44

5-
/*
6-
|--------------------------------------------------------------------------
7-
| PDO Fetch Style
8-
|--------------------------------------------------------------------------
9-
|
10-
| By default, database results will be returned as instances of the PHP
11-
| stdClass object; however, you may desire to retrieve records in an
12-
| array format for simplicity. Here you can tweak the fetch style.
13-
|
14-
*/
15-
16-
'fetch' => PDO::FETCH_OBJ,
17-
185
/*
196
|--------------------------------------------------------------------------
207
| Default Database Connection Name
@@ -54,21 +41,21 @@
5441

5542
'mysql' => [
5643
'driver' => 'mysql',
57-
'host' => env('DB_HOST', 'localhost'),
44+
'host' => env('DB_HOST', '127.0.0.1'),
5845
'port' => env('DB_PORT', '3306'),
5946
'database' => env('DB_DATABASE', 'forge'),
6047
'username' => env('DB_USERNAME', 'forge'),
6148
'password' => env('DB_PASSWORD', ''),
62-
'charset' => 'utf8',
63-
'collation' => 'utf8_unicode_ci',
49+
'charset' => 'utf8mb4',
50+
'collation' => 'utf8mb4_unicode_ci',
6451
'prefix' => '',
6552
'strict' => true,
6653
'engine' => null,
6754
],
6855

6956
'pgsql' => [
7057
'driver' => 'pgsql',
71-
'host' => env('DB_HOST', 'localhost'),
58+
'host' => env('DB_HOST', '127.0.0.1'),
7259
'port' => env('DB_PORT', '5432'),
7360
'database' => env('DB_DATABASE', 'forge'),
7461
'username' => env('DB_USERNAME', 'forge'),
@@ -107,10 +94,10 @@
10794

10895
'redis' => [
10996

110-
'cluster' => false,
97+
'client' => 'predis',
11198

11299
'default' => [
113-
'host' => env('REDIS_HOST', 'localhost'),
100+
'host' => env('REDIS_HOST', '127.0.0.1'),
114101
'password' => env('REDIS_PASSWORD', null),
115102
'port' => env('REDIS_PORT', 6379),
116103
'database' => 0,

config/filesystems.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
|--------------------------------------------------------------------------
99
|
1010
| Here you may specify the default filesystem disk that should be used
11-
| by the framework. A "local" driver, as well as a variety of cloud
12-
| based drivers are available for your choosing. Just store away!
13-
|
14-
| Supported: "local", "ftp", "s3", "rackspace"
11+
| by the framework. The "local" disk, as well as a variety of cloud
12+
| based disks are available to your application. Just store away!
1513
|
1614
*/
1715

@@ -39,6 +37,8 @@
3937
| may even configure multiple disks of the same driver. Defaults have
4038
| been setup for each driver as an example of the required options.
4139
|
40+
| Supported Drivers: "local", "ftp", "s3", "rackspace"
41+
|
4242
*/
4343

4444
'disks' => [
@@ -51,15 +51,16 @@
5151
'public' => [
5252
'driver' => 'local',
5353
'root' => storage_path('app/public'),
54+
'url' => env('APP_URL').'/storage',
5455
'visibility' => 'public',
5556
],
5657

5758
's3' => [
5859
'driver' => 's3',
59-
'key' => 'your-key',
60-
'secret' => 'your-secret',
61-
'region' => 'your-region',
62-
'bucket' => 'your-bucket',
60+
'key' => env('AWS_KEY'),
61+
'secret' => env('AWS_SECRET'),
62+
'region' => env('AWS_REGION'),
63+
'bucket' => env('AWS_BUCKET'),
6364
],
6465

6566
],

config/mail.php

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| sending of e-mail. You may specify which one you're using throughout
1212
| your application here. By default, Laravel is setup for SMTP mail.
1313
|
14-
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
15-
| "ses", "sparkpost", "log"
14+
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
15+
| "sparkpost", "log", "array"
1616
|
1717
*/
1818

@@ -56,8 +56,8 @@
5656
*/
5757

5858
'from' => [
59-
'address' => '[email protected]',
60-
'name' => 'Example',
59+
'address' => env('MAIL_FROM_ADDRESS', '[email protected]'),
60+
'name' => env('MAIL_FROM_NAME', 'Example'),
6161
],
6262

6363
/*
@@ -86,30 +86,38 @@
8686

8787
'username' => env('MAIL_USERNAME'),
8888

89+
'password' => env('MAIL_PASSWORD'),
90+
8991
/*
9092
|--------------------------------------------------------------------------
91-
| SMTP Server Password
93+
| Sendmail System Path
9294
|--------------------------------------------------------------------------
9395
|
94-
| Here you may set the password required by your SMTP server to send out
95-
| messages from your application. This will be given to the server on
96-
| connection so that the application will be able to send messages.
96+
| When using the "sendmail" driver to send e-mails, we will need to know
97+
| the path to where Sendmail lives on this server. A default path has
98+
| been provided here, which will work well on most of your systems.
9799
|
98100
*/
99101

100-
'password' => env('MAIL_PASSWORD'),
102+
'sendmail' => '/usr/sbin/sendmail -bs',
101103

102104
/*
103105
|--------------------------------------------------------------------------
104-
| Sendmail System Path
106+
| Markdown Mail Settings
105107
|--------------------------------------------------------------------------
106108
|
107-
| When using the "sendmail" driver to send e-mails, we will need to know
108-
| the path to where Sendmail lives on this server. A default path has
109-
| been provided here, which will work well on most of your systems.
109+
| If you are using Markdown based email rendering, you may configure your
110+
| theme and component paths here, allowing you to customize the design
111+
| of the emails. Or, you may simply stick with the Laravel defaults!
110112
|
111113
*/
112114

113-
'sendmail' => '/usr/sbin/sendmail -bs',
115+
'markdown' => [
116+
'theme' => 'default',
117+
118+
'paths' => [
119+
resource_path('views/vendor/mail'),
120+
],
121+
],
114122

115123
];

config/queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
| Default Queue Driver
88
|--------------------------------------------------------------------------
99
|
10-
| The Laravel queue API supports a variety of back-ends via an unified
10+
| Laravel's queue API supports an assortment of back-ends via a single
1111
| API, giving you convenient access to each back-end using the same
1212
| syntax for each one. Here you may set the default queue driver.
1313
|

config/services.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131

3232
'stripe' => [
33-
'model' => Framework\User::class,
33+
'model' => App\User::class,
3434
'key' => env('STRIPE_KEY'),
3535
'secret' => env('STRIPE_SECRET'),
3636
],

0 commit comments

Comments
 (0)