diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 2c07950f0..7c681e22c 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -27,14 +27,14 @@ class InstallDocker isCaCertificate: true, validityDays: 15 * 365 ); - $serverCertPath = config('constants.coolify.base_config_path').'/ssl/'; + $caCertPath = config('constants.coolify.base_config_path').'/ssl/'; $commands = collect([ - "mkdir -p $serverCertPath", - "chown -R 9999:root $serverCertPath", - "chmod -R 700 $serverCertPath", - "echo '{$serverCert->ssl_certificate}' > $serverCertPath/coolify-ca.crt", - "chmod 644 $serverCertPath/coolify-ca.crt", + "mkdir -p $caCertPath", + "chown -R 9999:root $caCertPath", + "chmod -R 700 $caCertPath", + "echo '{$serverCert->ssl_certificate}' > $caCertPath/coolify-ca.crt", + "chmod 644 $caCertPath/coolify-ca.crt", ]); remote_process($commands, $server); } diff --git a/app/Livewire/Server/Advanced.php b/app/Livewire/Server/Advanced.php index 195b54d18..4390d691e 100644 --- a/app/Livewire/Server/Advanced.php +++ b/app/Livewire/Server/Advanced.php @@ -96,7 +96,7 @@ class Advanced extends Component public function regenerateCaCertificate() { try { - $caCert = SslHelper::generateSslCertificate( + SslHelper::generateSslCertificate( commonName: 'Coolify CA Certificate', serverId: $this->server->id, isCaCertificate: true, @@ -119,15 +119,15 @@ class Advanced extends Component private function writeCertificateToServer() { - $serverCertPath = config('constants.coolify.base_config_path').'/ssl/'; + $caCertPath = config('constants.coolify.base_config_path').'/ssl/'; $commands = collect([ - "mkdir -p $serverCertPath", - "chown -R 9999:root $serverCertPath", - "chmod -R 700 $serverCertPath", - "rm -f $serverCertPath/coolify-ca.crt", - "echo '{$this->caCertificate->ssl_certificate}' > $serverCertPath/coolify-ca.crt", - "chmod 644 $serverCertPath/coolify-ca.crt", + "mkdir -p $caCertPath", + "chown -R 9999:root $caCertPath", + "chmod -R 700 $caCertPath", + "rm -f $caCertPath/coolify-ca.crt", + "echo '{$this->caCertificate->ssl_certificate}' > $caCertPath/coolify-ca.crt", + "chmod 644 $caCertPath/coolify-ca.crt", ]); remote_process($commands, $this->server); diff --git a/database/seeders/CaSslCertSeeder.php b/database/seeders/CaSslCertSeeder.php index 8e26bbdca..e3672d053 100644 --- a/database/seeders/CaSslCertSeeder.php +++ b/database/seeders/CaSslCertSeeder.php @@ -16,25 +16,27 @@ class CaSslCertSeeder extends Seeder $existingCert = SslCertificate::where('server_id', $server->id)->where('is_ca_certificate', true)->first(); if (! $existingCert) { - $serverCert = SslHelper::generateSslCertificate( + $caCert = SslHelper::generateSslCertificate( commonName: 'Coolify CA Certificate', serverId: $server->id, isCaCertificate: true, validityDays: 15 * 365 ); - - $serverCertPath = config('constants.coolify.base_config_path').'/ssl/'; - - $commands = collect([ - "mkdir -p $serverCertPath", - "chown -R 9999:root $serverCertPath", - "chmod -R 700 $serverCertPath", - "echo '{$serverCert->ssl_certificate}' > $serverCertPath/coolify-ca.crt", - "chmod 644 $serverCertPath/coolify-ca.crt", - ]); - - remote_process($commands, $server); + } else { + $caCert = $existingCert; } + $caCertPath = config('constants.coolify.base_config_path').'/ssl/'; + + $commands = collect([ + "mkdir -p $caCertPath", + "chown -R 9999:root $caCertPath", + "chmod -R 700 $caCertPath", + "rm -f $caCertPath/coolify-ca.crt", + "echo '{$caCert->ssl_certificate}' > $caCertPath/coolify-ca.crt", + "chmod 644 $caCertPath/coolify-ca.crt", + ]); + + remote_process($commands, $server); } }); }