1
0
mirror of https://github.com/laravel/valet.git synced 2026-02-04 16:10:08 +01:00

prevent the old cert from being removed if the trust ca command is canceled

This commit is contained in:
Austin Drummond
2024-06-21 13:14:48 -04:00
parent 72845a36f7
commit a39a7b0937

View File

@@ -475,17 +475,18 @@ public function secure(string $url, ?string $siteConf = null, int $certificateEx
// Extract in order to later preserve custom PHP version config when securing
$phpVersion = $this->customPhpVersion($url);
$this->unsecure($url);
// Create the CA if it doesn't exist.
// If the user cancels the trust operation, the old certificate will be not removed.
$this->files->ensureDirExists($this->caPath(), user());
$caExpireInDate = (new \DateTime())->diff(new \DateTime("+{$caExpireInYears} years"));
$this->createCa($caExpireInDate->format('%a'));
$this->unsecure($url);
$this->files->ensureDirExists($this->certificatesPath(), user());
$this->files->ensureDirExists($this->nginxPath(), user());
$caExpireInDate = (new \DateTime())->diff(new \DateTime("+{$caExpireInYears} years"));
$this->createCa($caExpireInDate->format('%a'));
$this->createCertificate($url, $certificateExpireInDays);
$siteConf = $this->buildSecureNginxServer($url, $siteConf);