prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve merge conflicts with next branch

Browse source 
- Combine proxy timeout validation with proxy_socket_keepalive refactor
- Fix duplicate proxyTimeout entry in Mariadb validation attributes
This commit is contained in:
ShadowArcanist 2026-01-05 14:22:46 +01:00
parent 0b0831d942
commit dab0a05d3e
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Actions/Database/StartDatabaseProxy.php
View file

@ -44,7 +44,6 @@ class StartDatabaseProxy
$databaseType = $database->databaseType();
$network = $database->service->uuid;
$server = data_get($database, 'service.destination.server');
$proxyContainerName = "{$database->service->uuid}-proxy";
$containerName = "{$database->name}-{$database->service->uuid}";
}
$internalPort = match ($databaseType) {
@ -66,7 +65,7 @@ class StartDatabaseProxy
if (isDev()) {
$configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$database->uuid.'/proxy';
}
$proxyTimeout = $database->proxy_timeout ?? 1800; // Default to 30 minutes if not set
$proxyTimeout = $database->proxy_timeout ?? 1800;
$timeoutDirective = "proxy_timeout {$proxyTimeout}s;";
$nginxconf = <<<EOF
user nginx;

1
app/Livewire/Project/Database/Mariadb/General.php
View file

@ -119,7 +119,6 @@ class General extends Component
'isPublic' => 'Is Public',
'publicPort' => 'Public Port',
'proxyTimeout' => 'Proxy Timeout',
'proxyTimeout' => 'Proxy Timeout',
'customDockerRunOptions' => 'Custom Docker Options',
'enableSsl' => 'Enable SSL',
];