An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix: address review feedback on proxy timeout
Brendan G. Lim040658c14241
diff --git a/app/Actions/Database/StartDatabaseProxy.php b/app/Actions/Database/StartDatabaseProxy.phpindex c7713a9654..0d20fa4a40 100644--- a/app/Actions/Database/StartDatabaseProxy.php+++ b/app/Actions/Database/StartDatabaseProxy.php@@ -70,7 +70,6 @@ class StartDatabaseProxylisten $database->public_port;proxy_pass $containerName:$internalPort;$timeoutConfig- proxy_connect_timeout 60s;}}EOF;diff --git a/app/Livewire/Project/Database/Clickhouse/General.php b/app/Livewire/Project/Database/Clickhouse/General.phpindex ee2ae7bd4e..9de75c1c5b 100644--- a/app/Livewire/Project/Database/Clickhouse/General.php+++ b/app/Livewire/Project/Database/Clickhouse/General.php@@ -82,7 +82,7 @@ class General extends Component'portsMappings' => 'nullable|string','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','customDockerRunOptions' => 'nullable|string','dbUrl' => 'nullable|string','dbUrlPublic' => 'nullable|string',@@ -103,6 +103,7 @@ class General extends Component'image.string' => 'The Docker Image must be a string.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',]);}diff --git a/app/Livewire/Project/Database/Dragonfly/General.php b/app/Livewire/Project/Database/Dragonfly/General.phpindex 6d1b5f74f2..d35e57a9da 100644--- a/app/Livewire/Project/Database/Dragonfly/General.php+++ b/app/Livewire/Project/Database/Dragonfly/General.php@@ -93,7 +93,7 @@ class General extends Component'portsMappings' => 'nullable|string','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','customDockerRunOptions' => 'nullable|string','dbUrl' => 'nullable|string','dbUrlPublic' => 'nullable|string',@@ -113,6 +113,7 @@ class General extends Component'image.string' => 'The Docker Image must be a string.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',]);}diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.phpindex 19726e4137..adb4ccb5f1 100644--- a/app/Livewire/Project/Database/Keydb/General.php+++ b/app/Livewire/Project/Database/Keydb/General.php@@ -96,7 +96,7 @@ class General extends Component'portsMappings' => 'nullable|string','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','customDockerRunOptions' => 'nullable|string','dbUrl' => 'nullable|string','dbUrlPublic' => 'nullable|string',@@ -118,6 +118,7 @@ class General extends Component'image.string' => 'The Docker Image must be a string.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',]);}diff --git a/app/Livewire/Project/Database/Mariadb/General.php b/app/Livewire/Project/Database/Mariadb/General.phpindex cb7b99a832..14240c82df 100644--- a/app/Livewire/Project/Database/Mariadb/General.php+++ b/app/Livewire/Project/Database/Mariadb/General.php@@ -81,7 +81,7 @@ class General extends Component'portsMappings' => 'nullable','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','isLogDrainEnabled' => 'nullable|boolean','customDockerRunOptions' => 'nullable','enableSsl' => 'boolean',@@ -101,6 +101,7 @@ class General extends Component'image.required' => 'The Docker Image field is required.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.',]);}diff --git a/app/Livewire/Project/Database/Mongodb/General.php b/app/Livewire/Project/Database/Mongodb/General.phpindex 8c7eea1b3a..11419ec714 100644--- a/app/Livewire/Project/Database/Mongodb/General.php+++ b/app/Livewire/Project/Database/Mongodb/General.php@@ -80,7 +80,7 @@ class General extends Component'portsMappings' => 'nullable','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','isLogDrainEnabled' => 'nullable|boolean','customDockerRunOptions' => 'nullable','enableSsl' => 'boolean',@@ -100,6 +100,7 @@ class General extends Component'image.required' => 'The Docker Image field is required.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.','sslMode.in' => 'The SSL Mode must be one of: allow, prefer, require, verify-full.',]);diff --git a/app/Livewire/Project/Database/Mysql/General.php b/app/Livewire/Project/Database/Mysql/General.phpindex 371ab7f68c..4f0f5eb197 100644--- a/app/Livewire/Project/Database/Mysql/General.php+++ b/app/Livewire/Project/Database/Mysql/General.php@@ -83,7 +83,7 @@ class General extends Component'portsMappings' => 'nullable','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','isLogDrainEnabled' => 'nullable|boolean','customDockerRunOptions' => 'nullable','enableSsl' => 'boolean',@@ -104,6 +104,7 @@ class General extends Component'image.required' => 'The Docker Image field is required.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.','sslMode.in' => 'The SSL Mode must be one of: PREFERRED, REQUIRED, VERIFY_CA, VERIFY_IDENTITY.',]);diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.phpindex fa8c697890..4e044672b4 100644--- a/app/Livewire/Project/Database/Postgresql/General.php+++ b/app/Livewire/Project/Database/Postgresql/General.php@@ -95,7 +95,7 @@ class General extends Component'portsMappings' => 'nullable','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','isLogDrainEnabled' => 'nullable|boolean','customDockerRunOptions' => 'nullable','enableSsl' => 'boolean',@@ -115,6 +115,7 @@ class General extends Component'image.required' => 'The Docker Image field is required.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.','sslMode.in' => 'The SSL Mode must be one of: allow, prefer, require, verify-ca, verify-full.',]);diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.phpindex be22420249..ebe2f3ba09 100644--- a/app/Livewire/Project/Database/Redis/General.php+++ b/app/Livewire/Project/Database/Redis/General.php@@ -76,7 +76,7 @@ class General extends Component'portsMappings' => 'nullable','isPublic' => 'nullable|boolean','publicPort' => 'nullable|integer',- 'publicPortTimeout' => 'nullable|integer',+ 'publicPortTimeout' => 'nullable|integer|min:1','isLogDrainEnabled' => 'nullable|boolean','customDockerRunOptions' => 'nullable','redisUsername' => 'required',@@ -94,6 +94,7 @@ class General extends Component'image.required' => 'The Docker Image field is required.','publicPort.integer' => 'The Public Port must be an integer.','publicPortTimeout.integer' => 'The Public Port Timeout must be an integer.',+ 'publicPortTimeout.min' => 'The Public Port Timeout must be at least 1.','redisUsername.required' => 'The Redis Username field is required.','redisPassword.required' => 'The Redis Password field is required.',]diff --git a/resources/views/livewire/project/database/clickhouse/general.blade.php b/resources/views/livewire/project/database/clickhouse/general.blade.phpindex d4b95d4444..ceaaac508f 100644--- a/resources/views/livewire/project/database/clickhouse/general.blade.php+++ b/resources/views/livewire/project/database/clickhouse/general.blade.php@@ -78,8 +78,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div></form><h3 class="pt-4">Advanced</h3>diff --git a/resources/views/livewire/project/database/dragonfly/general.blade.php b/resources/views/livewire/project/database/dragonfly/general.blade.phpindex f33cf1546f..e81d51c071 100644--- a/resources/views/livewire/project/database/dragonfly/general.blade.php+++ b/resources/views/livewire/project/database/dragonfly/general.blade.php@@ -115,8 +115,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div></form><h3 class="pt-4">Advanced</h3>diff --git a/resources/views/livewire/project/database/keydb/general.blade.php b/resources/views/livewire/project/database/keydb/general.blade.phpindex 6e69fd76df..522b96c0ab 100644--- a/resources/views/livewire/project/database/keydb/general.blade.php+++ b/resources/views/livewire/project/database/keydb/general.blade.php@@ -115,8 +115,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort" label="Public Port"canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><x-forms.textareahelper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>KeyDB Default Configuration</a>"diff --git a/resources/views/livewire/project/database/mariadb/general.blade.php b/resources/views/livewire/project/database/mariadb/general.blade.phpindex 754127b4f5..eb7930d806 100644--- a/resources/views/livewire/project/database/mariadb/general.blade.php+++ b/resources/views/livewire/project/database/mariadb/general.blade.php@@ -139,8 +139,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}"id="publicPort" label="Public Port" canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><x-forms.textarea label="Custom MariaDB Configuration" rows="10" id="mariadbConf"canGate="update" :canResource="$database" />diff --git a/resources/views/livewire/project/database/mongodb/general.blade.php b/resources/views/livewire/project/database/mongodb/general.blade.phpindex 4202578dd7..fa34b97954 100644--- a/resources/views/livewire/project/database/mongodb/general.blade.php+++ b/resources/views/livewire/project/database/mongodb/general.blade.php@@ -153,8 +153,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}"id="publicPort" label="Public Port" canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><x-forms.textarea label="Custom MongoDB Configuration" rows="10" id="mongoConf"canGate="update" :canResource="$database" />diff --git a/resources/views/livewire/project/database/mysql/general.blade.php b/resources/views/livewire/project/database/mysql/general.blade.phpindex cc23cae203..b1a75c455b 100644--- a/resources/views/livewire/project/database/mysql/general.blade.php+++ b/resources/views/livewire/project/database/mysql/general.blade.php@@ -155,8 +155,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}"id="publicPort" label="Public Port" canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><x-forms.textarea label="Custom Mysql Configuration" rows="10" id="mysqlConf" canGate="update" :canResource="$database" /><h3 class="pt-4">Advanced</h3>diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.phpindex e5cfe47858..74b1a03a82 100644--- a/resources/views/livewire/project/database/postgresql/general.blade.php+++ b/resources/views/livewire/project/database/postgresql/general.blade.php@@ -165,8 +165,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"label="Public Port" canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><div class="flex flex-col gap-2">diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.phpindex e0c3e430a5..11ffddd81c 100644--- a/resources/views/livewire/project/database/redis/general.blade.php+++ b/resources/views/livewire/project/database/redis/general.blade.php@@ -134,8 +134,8 @@</div><x-forms.input placeholder="5432" disabled="{{ $isPublic }}"id="publicPort" label="Public Port" canGate="update" :canResource="$database" />- <x-forms.input placeholder="3600" disabled="{{ !$isPublic }}" id="publicPortTimeout"- label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Set to 0 for no timeout. Default: 3600 (1 hour)." canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy Timeout (seconds)" helper="Timeout for the public TCP proxy connection in seconds. Default: 3600 (1 hour)." canGate="update" :canResource="$database" /></div><x-forms.textarea placeholder="# maxmemory 256mb# maxmemory-policy allkeys-lru