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

Merge branch 'next' into feat--terminal-pty

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-13 11:25:47 +02:00
committed by GitHub
parent 35dfb1b0f8 1738286983
commit b6080c2c8e
33 changed files with 852 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Server.php
View File

@@ -996,7 +996,7 @@ $schema://$host {
public function validateConnection()
{
config()->set('coolify.mux_enabled', false);
config()->set('constants.ssh.mux_enabled', false);
$server = Server::find($this->id);
if (! $server) {

2
app/Models/Service.php
View File

@@ -667,7 +667,7 @@ class Service extends BaseModel
}
$data = $data->merge([
'Root User' => [
'key' => 'N/A',
'key' => 'GITLAB_ROOT_USER',
'value' => 'root',
'rules' => 'required',
'isPassword' => true,

4
app/Models/StandaloneKeydb.php
View File

@@ -209,7 +209,7 @@ class StandaloneKeydb extends BaseModel
protected function internalDbUrl(): Attribute
{
return new Attribute(
get: fn () => "redis://{$this->keydb_password}@{$this->uuid}:6379/0",
get: fn () => "redis://:{$this->keydb_password}@{$this->uuid}:6379/0",
);
}
@@ -218,7 +218,7 @@ class StandaloneKeydb extends BaseModel
return new Attribute(
get: function () {
if ($this->is_public && $this->public_port) {
return "redis://{$this->keydb_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
return "redis://:{$this->keydb_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
}
return null;