Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/Actions/Database/StartDatabaseProxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|St
};
}

$proxyTimeout = $database->public_proxy_timeout ?? 0;
if ($proxyTimeout <= 0) {
$timeoutValue = '365d';
} else {
$timeoutValue = "{$proxyTimeout}s";
}

$configuration_dir = database_proxy_dir($database->uuid);
if (isDev()) {
$configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$database->uuid.'/proxy';
Expand All @@ -67,6 +74,8 @@ public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|St
server {
listen $database->public_port;
proxy_pass $containerName:$internalPort;
proxy_timeout $timeoutValue;
proxy_connect_timeout 60s;
}
}
EOF;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Clickhouse/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public ?string $customDockerRunOptions = null;

public ?string $dbUrl = null;
Expand Down Expand Up @@ -80,6 +82,7 @@ protected function rules(): array
'portsMappings' => 'nullable|string',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'customDockerRunOptions' => 'nullable|string',
'dbUrl' => 'nullable|string',
'dbUrlPublic' => 'nullable|string',
Expand Down Expand Up @@ -115,6 +118,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->save();
Expand All @@ -130,6 +134,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->dbUrl = $this->database->internal_db_url;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Dragonfly/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public ?string $customDockerRunOptions = null;

public ?string $dbUrl = null;
Expand Down Expand Up @@ -91,6 +93,7 @@ protected function rules(): array
'portsMappings' => 'nullable|string',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'customDockerRunOptions' => 'nullable|string',
'dbUrl' => 'nullable|string',
'dbUrlPublic' => 'nullable|string',
Expand Down Expand Up @@ -124,6 +127,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->enable_ssl = $this->enable_ssl;
Expand All @@ -139,6 +143,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->enable_ssl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Keydb/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public ?string $customDockerRunOptions = null;

public ?string $dbUrl = null;
Expand Down Expand Up @@ -94,6 +96,7 @@ protected function rules(): array
'portsMappings' => 'nullable|string',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'customDockerRunOptions' => 'nullable|string',
'dbUrl' => 'nullable|string',
'dbUrlPublic' => 'nullable|string',
Expand Down Expand Up @@ -130,6 +133,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->enable_ssl = $this->enable_ssl;
Expand All @@ -146,6 +150,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->enable_ssl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Mariadb/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public bool $isLogDrainEnabled = false;

public ?string $customDockerRunOptions = null;
Expand Down Expand Up @@ -79,6 +81,7 @@ protected function rules(): array
'portsMappings' => 'nullable',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
'enableSsl' => 'boolean',
Expand Down Expand Up @@ -154,6 +157,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->enable_ssl = $this->enableSsl;
Expand All @@ -173,6 +177,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->enableSsl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Mongodb/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public bool $isLogDrainEnabled = false;

public ?string $customDockerRunOptions = null;
Expand Down Expand Up @@ -78,6 +80,7 @@ protected function rules(): array
'portsMappings' => 'nullable',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
'enableSsl' => 'boolean',
Expand Down Expand Up @@ -153,6 +156,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->enable_ssl = $this->enableSsl;
Expand All @@ -172,6 +176,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->enableSsl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Mysql/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public bool $isLogDrainEnabled = false;

public ?string $customDockerRunOptions = null;
Expand Down Expand Up @@ -81,6 +83,7 @@ protected function rules(): array
'portsMappings' => 'nullable',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
'enableSsl' => 'boolean',
Expand Down Expand Up @@ -159,6 +162,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->enable_ssl = $this->enableSsl;
Expand All @@ -179,6 +183,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->enableSsl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Postgresql/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public bool $isLogDrainEnabled = false;

public ?string $customDockerRunOptions = null;
Expand Down Expand Up @@ -93,6 +95,7 @@ protected function rules(): array
'portsMappings' => 'nullable',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
'enableSsl' => 'boolean',
Expand Down Expand Up @@ -174,6 +177,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->enable_ssl = $this->enableSsl;
Expand All @@ -196,6 +200,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->enableSsl = $this->database->enable_ssl;
Expand Down
5 changes: 5 additions & 0 deletions app/Livewire/Project/Database/Redis/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class General extends Component

public ?int $publicPort = null;

public ?int $publicProxyTimeout = null;

public bool $isLogDrainEnabled = false;

public ?string $customDockerRunOptions = null;
Expand Down Expand Up @@ -74,6 +76,7 @@ protected function rules(): array
'portsMappings' => 'nullable',
'isPublic' => 'nullable|boolean',
'publicPort' => 'nullable|integer',
'publicProxyTimeout' => 'nullable|integer|min:0',
'isLogDrainEnabled' => 'nullable|boolean',
'customDockerRunOptions' => 'nullable',
'redisUsername' => 'required',
Expand Down Expand Up @@ -143,6 +146,7 @@ public function syncData(bool $toModel = false)
$this->database->ports_mappings = $this->portsMappings;
$this->database->is_public = $this->isPublic;
$this->database->public_port = $this->publicPort;
$this->database->public_proxy_timeout = $this->publicProxyTimeout;
$this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
$this->database->custom_docker_run_options = $this->customDockerRunOptions;
$this->database->enable_ssl = $this->enableSsl;
Expand All @@ -158,6 +162,7 @@ public function syncData(bool $toModel = false)
$this->portsMappings = $this->database->ports_mappings;
$this->isPublic = $this->database->is_public;
$this->publicPort = $this->database->public_port;
$this->publicProxyTimeout = $this->database->public_proxy_timeout;
$this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
$this->customDockerRunOptions = $this->database->custom_docker_run_options;
$this->enableSsl = $this->database->enable_ssl;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
$tables = [
'standalone_postgresqls',
'standalone_mysqls',
'standalone_mariadbs',
'standalone_redis',
'standalone_keydbs',
'standalone_dragonflies',
'standalone_mongodbs',
'standalone_clickhouses',
'service_databases',
];

foreach ($tables as $table) {
Schema::table($table, function (Blueprint $table) {
$table->integer('public_proxy_timeout')->default(0)->after('public_port');
});
}
}

/**
* Reverse the migrations.
*/
public function down(): void
{
$tables = [
'standalone_postgresqls',
'standalone_mysqls',
'standalone_mariadbs',
'standalone_redis',
'standalone_keydbs',
'standalone_dragonflies',
'standalone_mongodbs',
'standalone_clickhouses',
'service_databases',
];

foreach ($tables as $table) {
Schema::table($table, function (Blueprint $table) {
$table->dropColumn('public_proxy_timeout');
});
}
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
</div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"
canGate="update" :canResource="$database" />
<x-forms.input placeholder="0" id="publicProxyTimeout" label="Proxy Timeout (seconds)"
helper="Timeout in seconds for idle proxy connections. Set to 0 for no timeout (default)."
canGate="update" :canResource="$database" />
</div>
</form>
<h3 class="pt-4">Advanced</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
</div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"
canGate="update" :canResource="$database" />
<x-forms.input placeholder="0" id="publicProxyTimeout" label="Proxy Timeout (seconds)"
helper="Timeout in seconds for idle proxy connections. Set to 0 for no timeout (default)."
canGate="update" :canResource="$database" />
</div>
</form>
<h3 class="pt-4">Advanced</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
</div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"
canGate="update" :canResource="$database" />
<x-forms.input placeholder="0" id="publicProxyTimeout" label="Proxy Timeout (seconds)"
helper="Timeout in seconds for idle proxy connections. Set to 0 for no timeout (default)."
canGate="update" :canResource="$database" />
</div>
<x-forms.textarea
helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>KeyDB Default Configuration</a>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@
</div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}"
id="publicPort" label="Public Port" canGate="update" :canResource="$database" />
<x-forms.input placeholder="0" id="publicProxyTimeout" label="Proxy Timeout (seconds)"
helper="Timeout in seconds for idle proxy connections. Set to 0 for no timeout (default)."
canGate="update" :canResource="$database" />
</div>
<x-forms.textarea label="Custom MariaDB Configuration" rows="10" id="mariadbConf"
canGate="update" :canResource="$database" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@
</div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}"
id="publicPort" label="Public Port" canGate="update" :canResource="$database" />
<x-forms.input placeholder="0" id="publicProxyTimeout" label="Proxy Timeout (seconds)"
helper="Timeout in seconds for idle proxy connections. Set to 0 for no timeout (default)."
canGate="update" :canResource="$database" />
</div>
<x-forms.textarea label="Custom MongoDB Configuration" rows="10" id="mongoConf"
canGate="update" :canResource="$database" />
Expand Down
Loading