diff --git a/app/Livewire/Project/Database/Mariadb/General.php b/app/Livewire/Project/Database/Mariadb/General.php index 1eda804c9..a963e0ca3 100644 --- a/app/Livewire/Project/Database/Mariadb/General.php +++ b/app/Livewire/Project/Database/Mariadb/General.php @@ -40,7 +40,6 @@ class General extends Component 'database.is_log_drain_enabled' => 'nullable|boolean', 'database.custom_docker_run_options' => 'nullable', 'database.enable_ssl' => 'boolean', - 'database.ssl_mode' => 'nullable|string|in:PREFERRED,REQUIRED,VERIFY_CA,VERIFY_IDENTITY', ]; protected $validationAttributes = [ @@ -57,7 +56,6 @@ class General extends Component 'database.public_port' => 'Public Port', 'database.custom_docker_run_options' => 'Custom Docker Options', 'database.enable_ssl' => 'Enable SSL', - 'database.ssl_mode' => 'SSL Mode', ]; public function mount() @@ -147,7 +145,6 @@ class General extends Component { try { $this->database->enable_ssl = $this->database->enable_ssl; - $this->database->ssl_mode = $this->database->ssl_mode; $this->database->save(); $this->dispatch('success', 'SSL configuration updated.'); } catch (Exception $e) { diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php index 24f011f12..523fde3c5 100644 --- a/app/Models/StandaloneMariadb.php +++ b/app/Models/StandaloneMariadb.php @@ -218,17 +218,7 @@ class StandaloneMariadb extends BaseModel protected function internalDbUrl(): Attribute { return new Attribute( - get: function () { - $url = "mysql://{$this->mariadb_user}:{$this->mariadb_password}@{$this->uuid}:3306/{$this->mariadb_database}"; - if ($this->enable_ssl) { - $url .= "?ssl-mode={$this->ssl_mode}"; - if (in_array($this->ssl_mode, ['VERIFY_CA', 'VERIFY_IDENTITY'])) { - $url .= '&ssl-ca=/etc/ssl/certs/coolify-ca.crt'; - } - } - - return $url; - }, + get: fn () => "mysql://{$this->mariadb_user}:{$this->mariadb_password}@{$this->uuid}:3306/{$this->mariadb_database}", ); } @@ -237,15 +227,7 @@ class StandaloneMariadb extends BaseModel return new Attribute( get: function () { if ($this->is_public && $this->public_port) { - $url = "mysql://{$this->mariadb_user}:{$this->mariadb_password}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mariadb_database}"; - if ($this->enable_ssl) { - $url .= "?ssl-mode={$this->ssl_mode}"; - if (in_array($this->ssl_mode, ['VERIFY_CA', 'VERIFY_IDENTITY'])) { - $url .= '&ssl-ca=/etc/ssl/certs/coolify-ca.crt'; - } - } - - return $url; + return "mysql://{$this->mariadb_user}:{$this->mariadb_password}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mariadb_database}"; } return null; diff --git a/resources/views/livewire/project/database/mariadb/general.blade.php b/resources/views/livewire/project/database/mariadb/general.blade.php index 673868667..96ba3a06a 100644 --- a/resources/views/livewire/project/database/mariadb/general.blade.php +++ b/resources/views/livewire/project/database/mariadb/general.blade.php @@ -97,15 +97,6 @@
- @if($database->enable_ssl) - - - - - - - @endif