From a1e650e699757d0f2ea4461c50692f80f5cfd98e Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:42:28 +0100 Subject: [PATCH] chore: rename ca crt folder to ssl --- app/Actions/Server/InstallDocker.php | 3 ++- database/seeders/CaSslCertSeeder.php | 5 +++-- scripts/install.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 993d38e5f..2c07950f0 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -24,9 +24,10 @@ public function handle(Server $server) $serverCert = SslHelper::generateSslCertificate( commonName: 'Coolify CA Certificate', serverId: $server->id, + isCaCertificate: true, validityDays: 15 * 365 ); - $serverCertPath = config('constants.coolify.base_config_path').'/ca/'; + $serverCertPath = config('constants.coolify.base_config_path').'/ssl/'; $commands = collect([ "mkdir -p $serverCertPath", diff --git a/database/seeders/CaSslCertSeeder.php b/database/seeders/CaSslCertSeeder.php index 9970e8fb5..8e26bbdca 100644 --- a/database/seeders/CaSslCertSeeder.php +++ b/database/seeders/CaSslCertSeeder.php @@ -13,16 +13,17 @@ public function run() { Server::chunk(200, function ($servers) { foreach ($servers as $server) { - $existingCert = SslCertificate::where('server_id', $server->id)->first(); + $existingCert = SslCertificate::where('server_id', $server->id)->where('is_ca_certificate', true)->first(); if (! $existingCert) { $serverCert = SslHelper::generateSslCertificate( commonName: 'Coolify CA Certificate', serverId: $server->id, + isCaCertificate: true, validityDays: 15 * 365 ); - $serverCertPath = config('constants.coolify.base_config_path').'/ca/'; + $serverCertPath = config('constants.coolify.base_config_path').'/ssl/'; $commands = collect([ "mkdir -p $serverCertPath", diff --git a/scripts/install.sh b/scripts/install.sh index 6eb46ad09..c73bbb580 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -62,7 +62,7 @@ if [ "$WARNING_SPACE" = true ]; then sleep 5 fi -mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,ca,webhooks-during-maintenance,sentinel} +mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,ssl,webhooks-during-maintenance,sentinel} mkdir -p /data/coolify/ssh/{keys,mux} mkdir -p /data/coolify/proxy/dynamic