diff --git a/.env.example b/.env.example index 5678913..224d6ac 100755 --- a/.env.example +++ b/.env.example @@ -12,5 +12,5 @@ MAIL_PORT= MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null +MAIL_FROM_ADDRESS="noreply@${APP_NAME}" MAIL_FROM_NAME="${APP_NAME}" diff --git a/.env.prod b/.env.prod index 574eedb..59e259e 100755 --- a/.env.prod +++ b/.env.prod @@ -12,5 +12,5 @@ MAIL_PORT= MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null +MAIL_FROM_ADDRESS="noreply@${APP_NAME}" MAIL_FROM_NAME="${APP_NAME}" diff --git a/.env.sail b/.env.sail index db44bba..8768a86 100644 --- a/.env.sail +++ b/.env.sail @@ -13,5 +13,5 @@ MAIL_PORT= MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null +MAIL_FROM_ADDRESS="noreply@${APP_NAME}" MAIL_FROM_NAME="${APP_NAME}" diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 321ca5d..2f807c1 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -38,7 +38,7 @@ public function boot(): void return new Toast; }); - if (str(config('app.url'))->startsWith('https://')) { + if (str(request()->url())->startsWith('https://')) { URL::forceScheme('https'); } } diff --git a/app/SSH/OS/OS.php b/app/SSH/OS/OS.php index 87dc0ac..4f3d886 100644 --- a/app/SSH/OS/OS.php +++ b/app/SSH/OS/OS.php @@ -98,12 +98,12 @@ public function reboot(): void ); } - public function editFile(string $path, string $content): void + public function editFile(string $path, ?string $content = null): void { $this->server->ssh()->exec( $this->getScript('edit-file.sh', [ 'path' => $path, - 'content' => $content, + 'content' => $content ?? '', ]), ); }