Merge branch 'master' into develop

2019-07-25 00:49:45 -04:00
parent 7c9e5ea412 f73795ac05
commit 0dd31baf2a
5 changed files with 5 additions and 5 deletions
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -37,7 +37,7 @@ return [
            'app_id' => env('PUSHER_APP_ID'),
            'options' => [
                'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
+                'useTLS' => true,
            ],
        ],

--- a/config/database.php
+++ b/config/database.php
@@ -123,7 +123,7 @@ return [

        'options' => [
            'cluster' => env('REDIS_CLUSTER', 'predis'),
-            'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
        ],

        'default' => [