diff --git a/config/cache.php b/config/cache.php index 08547755f21cbfbb8b5e1feab55ba6087d49b377..69e6a79544f24ed7d85a0eb0925a08a448b18a8a 100755 --- a/config/cache.php +++ b/config/cache.php @@ -11,7 +11,7 @@ return [ | using this caching library. This connection is used when another is | not explicitly specified when executing a given caching function. | - */ + */ 'default' => env('CACHE_DRIVER', 'redis'), @@ -24,43 +24,43 @@ return [ | well as their drivers. You may even define multiple stores for the | same cache driver to group types of items stored in your caches. | - */ + */ - 'stores' => [ + 'stores' => [ - 'apc' => [ + 'apc' => [ 'driver' => 'apc', ], - 'array' => [ + 'array' => [ 'driver' => 'array', ], - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', + 'database' => [ + 'driver' => 'database', + 'table' => 'cache', 'connection' => null, ], - 'file' => [ + 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache'), + 'path' => storage_path('framework/cache'), ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', 'servers' => [ [ - 'host' => env('MEMCACHED_HOST', '127.0.0.1'), - 'port' => env('MEMCACHED_PORT', 11211), + 'host' => env('MEMCACHED_HOST', '127.0.0.1'), + 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], ], - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'redisCache', ], ], @@ -74,8 +74,8 @@ return [ | be other applications utilizing the same cache. So, we'll specify a | value to get prefixed to all our keys so we can avoid collisions. | - */ + */ - 'prefix' => 'laravel', + 'prefix' => 'laravel', ]; diff --git a/config/database.php b/config/database.php index 95646bcf2352226c409d484c1ccc68f6bbfa4a76..4e1c23ac3ca2003c9c9d5977956aa74b9ff5e899 100755 --- a/config/database.php +++ b/config/database.php @@ -11,9 +11,9 @@ return [ | stdClass object; however, you may desire to retrieve records in an | array format for simplicity. Here you can tweak the fetch style. | - */ + */ - 'fetch' => PDO::FETCH_CLASS, + 'fetch' => PDO::FETCH_CLASS, /* |-------------------------------------------------------------------------- @@ -24,9 +24,9 @@ return [ | to use as your default connection for all database work. Of course | you may use many connections at once using the Database library. | - */ + */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- @@ -42,40 +42,40 @@ return [ | so make sure you have the driver for your particular database of | choice installed on your machine before you begin development. | - */ + */ 'connections' => [ 'sqlite' => [ - 'driver' => 'sqlite', + 'driver' => 'sqlite', 'database' => database_path(env('DB_DATABASE', 'database.sqlite')), - 'prefix' => '', + 'prefix' => '', ], - 'mysql' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', + 'mysql' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - 'strict' => false, - 'engine' => null, + 'prefix' => '', + 'strict' => false, + 'engine' => null, ], - 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '5432'), + 'pgsql' => [ + 'driver' => 'pgsql', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '5432'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', + 'charset' => 'utf8', + 'prefix' => '', + 'schema' => 'public', ], ], @@ -89,9 +89,9 @@ return [ | your application. Using this information, we can determine which of | the migrations on disk haven't actually been run in the database. | - */ + */ - 'migrations' => 'migrations', + 'migrations' => 'migrations', /* |-------------------------------------------------------------------------- @@ -102,25 +102,30 @@ return [ | provides a richer set of commands than a typical key-value systems | such as APC or Memcached. Laravel makes it easy to dig right in. | - */ + */ - 'redis' => [ + 'redis' => [ - 'cluster' => false, + 'cluster' => false, - 'default' => [ - 'host' => env('REDIS_HOST', 'localhost'), + 'default' => [ + 'host' => env('REDIS_HOST', 'localhost'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), + 'port' => env('REDIS_PORT', 6379), 'database' => 0, ], - 'redisLogs' => [ - 'host' => env('REDIS_LOGS_HOST', 'localhost'), + 'redisLogs' => [ + 'host' => env('REDIS_LOGS_HOST', 'localhost'), 'password' => env('REDIS_LOGS_PASSWORD', env('REDIS_PASSWORD', null)), - 'port' => env('REDIS_MAIN_PORT', 6379), + 'port' => env('REDIS_LOGS_PORT', 6379), 'database' => 1, ], - + 'redisCache' => [ + 'host' => env('REDIS_CACHE_HOST', 'localhost'), + 'password' => env('REDIS_CACHE_PASSWORD', env('REDIS_PASSWORD', null)), + 'port' => env('REDIS_CACHE_PORT', 6379), + 'database' => 2, + ], ], ];