StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/upgrade-laravel-to-5.6

Browse source
This commit is contained in:
Dane Everitt 2018-05-20 16:30:42 -07:00 • committed by GitHub
commit 7e2e5fd7c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 234 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/database.php
View file

@ -98,14 +98,14 @@ return [
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => env('REDIS_DATBASE', 0),
'database' => env('REDIS_DATABASE', 0),
],
'sessions' => [
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => env('REDIS_DATBASE_SESSIONS', 1),
'database' => env('REDIS_DATABASE_SESSIONS', 1),
],
],
];

2
config/trustedproxy.php
View file

@ -34,7 +34,7 @@ return [
/*
* Or, to trust ALL proxies, including those that
* are in a chain of fowarding, uncomment this:
* are in a chain of forwarding, uncomment this:
*/
// 'proxies' => '**',