dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(ssl): get caCert correctly

Browse Source
This commit is contained in:
peaklabs-dev
2025-02-07 18:27:30 +01:00
parent 69a6010839
commit 6a52f51851
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Actions/Database/StartMariadb.php
View File

@@ -57,12 +57,11 @@ class StartMariadb
} else {
$this->commands[] = "echo 'Setting up SSL for this database.'";
$this->commands[] = "mkdir -p $this->configuration_dir/ssl";
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->id)->firstOrFail();
$this->ssl_certificate = SslCertificate::where('resource_type', $this->database->getMorphClass())
->where('resource_id', $this->database->id)
->first();
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->server_id)->where('is_ca_certificate', true)->first();
$this->ssl_certificate = SslCertificate::where('resource_type', $this->database->getMorphClass())->where('resource_id', $this->database->id)->first();
if (! $this->ssl_certificate) {
$this->commands[] = "echo 'No SSL certificate found, generating new SSL certificate for this database.'";

9
app/Actions/Database/StartMysql.php
View File

@@ -57,12 +57,11 @@ class StartMysql
} else {
$this->commands[] = "echo 'Setting up SSL for this database.'";
$this->commands[] = "mkdir -p $this->configuration_dir/ssl";
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->id)->firstOrFail();
$this->ssl_certificate = SslCertificate::where('resource_type', $this->database->getMorphClass())
->where('resource_id', $this->database->id)
->first();
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->server_id)->where('is_ca_certificate', true)->first();
$this->ssl_certificate = SslCertificate::where('resource_type', $this->database->getMorphClass())->where('resource_id', $this->database->id)->first();
if (! $this->ssl_certificate) {
$this->commands[] = "echo 'No SSL certificate found, generating new SSL certificate for this database.'";

4
app/Actions/Database/StartPostgresql.php
View File

@@ -62,9 +62,9 @@ class StartPostgresql
} else {
$this->commands[] = "echo 'Setting up SSL for this database.'";
$this->commands[] = "mkdir -p $this->configuration_dir/ssl";
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->id)->firstOrFail();
$server = $this->database->destination->server;
$caCert = SslCertificate::where('server_id', $server->server_id)->where('is_ca_certificate', true)->first();
$this->ssl_certificate = SslCertificate::where('resource_type', $this->database->getMorphClass())->where('resource_id', $this->database->id)->first();

5
app/Jobs/RegenerateSslCertJob.php
View File

@@ -47,10 +47,7 @@ class RegenerateSslCertJob implements ShouldQueue
foreach ($certificates as $certificate) {
try {
$caCert = SslCertificate::where('server_id', $certificate->server_id)
->where('resource_type', null)
->where('resource_id', null)
->first();
$caCert = SslCertificate::where('server_id', $certificate->server_id)->where('is_ca_certificate', true)->first();
SSLHelper::generateSslCertificate(
commonName: $certificate->common_name,