From 8f9b58a625df6460feb5c305263ec72a0a6266f8 Mon Sep 17 00:00:00 2001 From: Nathan Rzepecki Date: Fri, 21 Aug 2020 10:27:36 +0800 Subject: [PATCH 1/4] Add some extra ENV variables for the config file --- config/websockets.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/config/websockets.php b/config/websockets.php index bddb3d5633..6931ad2619 100644 --- a/config/websockets.php +++ b/config/websockets.php @@ -14,9 +14,7 @@ 'dashboard' => [ 'port' => env('LARAVEL_WEBSOCKETS_PORT', 6001), - 'path' => 'laravel-websockets', - 'middleware' => [ 'web', \BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize::class, @@ -115,17 +113,12 @@ */ 'ssl' => [ - + 'local_cert' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_CERT', null), - 'capath' => env('LARAVEL_WEBSOCKETS_SSL_CA', null), - 'local_pk' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_PK', null), - 'passphrase' => env('LARAVEL_WEBSOCKETS_SSL_PASSPHRASE', null), - 'verify_peer' => env('APP_ENV') === 'production', - 'allow_self_signed' => env('APP_ENV') !== 'production', ], @@ -164,11 +157,11 @@ 'replication' => [ - 'driver' => 'local', + 'driver' => env('LARAVEL_WEBSOCKETS_REPLICATION_DRIVER', 'local'), 'redis' => [ - 'connection' => 'default', + 'connection' => env('LARAVEL_WEBSOCKETS_REPLICATION_CONNECTION', 'default'), ], @@ -188,7 +181,7 @@ | */ - 'driver' => 'database', + 'driver' => env('LARAVEL_WEBSOCKETS_STATISTICS_DRIVER', 'database'), 'database' => [ From f1c04d3192c77572060db6769e4ce6cefd27bb6c Mon Sep 17 00:00:00 2001 From: Nathan Rzepecki Date: Fri, 21 Aug 2020 10:31:54 +0800 Subject: [PATCH 2/4] Fix some of the formatting --- config/websockets.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/websockets.php b/config/websockets.php index 6931ad2619..a53a90f554 100644 --- a/config/websockets.php +++ b/config/websockets.php @@ -14,7 +14,9 @@ 'dashboard' => [ 'port' => env('LARAVEL_WEBSOCKETS_PORT', 6001), + 'path' => 'laravel-websockets', + 'middleware' => [ 'web', \BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize::class, @@ -113,12 +115,17 @@ */ 'ssl' => [ - + 'local_cert' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_CERT', null), + 'capath' => env('LARAVEL_WEBSOCKETS_SSL_CA', null), + 'local_pk' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_PK', null), + 'passphrase' => env('LARAVEL_WEBSOCKETS_SSL_PASSPHRASE', null), + 'verify_peer' => env('APP_ENV') === 'production', + 'allow_self_signed' => env('APP_ENV') !== 'production', ], From e30b147b3a25cd83e5962938d5483915c034f6cb Mon Sep 17 00:00:00 2001 From: Nathan Rzepecki Date: Fri, 21 Aug 2020 10:32:36 +0800 Subject: [PATCH 3/4] Not sure why the formatting changed --- config/websockets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/websockets.php b/config/websockets.php index a53a90f554..6c5a6ec21d 100644 --- a/config/websockets.php +++ b/config/websockets.php @@ -125,7 +125,7 @@ 'passphrase' => env('LARAVEL_WEBSOCKETS_SSL_PASSPHRASE', null), 'verify_peer' => env('APP_ENV') === 'production', - + 'allow_self_signed' => env('APP_ENV') !== 'production', ], From 91c24c30e81c675ed813ef39a1ccbea075f2f69e Mon Sep 17 00:00:00 2001 From: Nathan Rzepecki Date: Fri, 21 Aug 2020 10:27:36 +0800 Subject: [PATCH 4/4] Add some extra ENV variables for the config file --- config/websockets.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/websockets.php b/config/websockets.php index bddb3d5633..6c5a6ec21d 100644 --- a/config/websockets.php +++ b/config/websockets.php @@ -164,11 +164,11 @@ 'replication' => [ - 'driver' => 'local', + 'driver' => env('LARAVEL_WEBSOCKETS_REPLICATION_DRIVER', 'local'), 'redis' => [ - 'connection' => 'default', + 'connection' => env('LARAVEL_WEBSOCKETS_REPLICATION_CONNECTION', 'default'), ], @@ -188,7 +188,7 @@ | */ - 'driver' => 'database', + 'driver' => env('LARAVEL_WEBSOCKETS_STATISTICS_DRIVER', 'database'), 'database' => [