diff --git a/.env.example b/.env.example index 81da09125..5676f7eb2 100644 --- a/.env.example +++ b/.env.example @@ -21,7 +21,6 @@ DB_PREFIX= BROADCAST_DRIVER=log CACHE_DRIVER=file SESSION_DRIVER=file -SESSION_DATABASE_CONNECTION= SESSION_LIFETIME=120 QUEUE_DRIVER=sync diff --git a/config/cache.php b/config/cache.php index d30909e67..37ff71237 100755 --- a/config/cache.php +++ b/config/cache.php @@ -70,17 +70,7 @@ return [ 'redis' => [ 'driver' => 'redis', - - 'clusters' => [ - 'default' => [ - [ - 'host' => env('REDIS_HOST', 'localhost'), - 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => 0, - ], - ], - ], + 'connection' => env('CACHE_CONNECTION', 'cache'), ], ], diff --git a/config/database.php b/config/database.php index 2505602b4..dbdd2def2 100755 --- a/config/database.php +++ b/config/database.php @@ -1,5 +1,7 @@ env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'database' => env('REDIS_DEFAULT_DATABASE', '0'), + ], + + 'cache' => [ + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_CACHE_DATABASE', '1'), ], 'session' => [ 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), 'port' => env('REDIS_PORT', 6379), - 'database' => 1, + 'database' => env('REDIS_SESSION_DATABASE', '2'), ], ], diff --git a/config/session.php b/config/session.php index 147e69d9c..20cc47f79 100755 --- a/config/session.php +++ b/config/session.php @@ -70,7 +70,7 @@ return [ | */ - 'connection' => env('SESSION_DATABASE_CONNECTION', null), + 'connection' => env('SESSION_CONNECTION', 'session'), /* |--------------------------------------------------------------------------