rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into light-mode-wtf

Browse source
This commit is contained in:
Andras Bacsai 2025-11-04 21:16:15 +01:00
commit e925111595
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
resources/views/livewire/project/database/postgresql/general.blade.php
View file

@ -31,11 +31,11 @@
</div> </div>
@if ($database->started_at) @if ($database->started_at)
<div class="flex xl:flex-row flex-col gap-2"> <div class="flex xl:flex-row flex-col gap-2">
<x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
canGate="update" :canResource="$database" :canResource="$database"
helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
<x-forms.input label="Password" id="postgresPassword" type="password" required <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
canGate="update" :canResource="$database" :canResource="$database"
helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
<x-forms.input label="Initial Database" id="postgresDb" <x-forms.input label="Initial Database" id="postgresDb"
placeholder="If empty, it will be the same as Username." readonly placeholder="If empty, it will be the same as Username." readonly
@ -43,19 +43,19 @@
</div> </div>
@else @else
<div class="flex xl:flex-row flex-col gap-2 pb-2"> <div class="flex xl:flex-row flex-col gap-2 pb-2">
<x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
<x-forms.input label="Password" id="postgresPassword" type="password" required <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
<x-forms.input label="Initial Database" id="postgresDb" <x-forms.input label="Initial Database" id="postgresDb"
placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" /> placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" />
</div> </div>
@endif @endif
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database" <x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database" id="postgresInitdbArgs"
id="postgresInitdbArgs" placeholder="If empty, use default. See in docker docs." /> placeholder="If empty, use default. See in docker docs." />
<x-forms.input label="Host Auth Method" canGate="update" :canResource="$database" <x-forms.input label="Host Auth Method" canGate="update" :canResource="$database" id="postgresHostAuthMethod"
id="postgresHostAuthMethod" placeholder="If empty, use default. See in docker docs." /> placeholder="If empty, use default. See in docker docs." />
</div> </div>
<x-forms.input <x-forms.input
helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>" helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
@ -107,20 +107,19 @@
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<div class="w-64" wire:key='enable_ssl'> <div class="w-64" wire:key='enable_ssl'>
@if ($database->isExited()) @if ($database->isExited())
<x-forms.checkbox id="enableSsl" label="Enable SSL" <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
wire:model.live="enableSsl" instantSave="instantSaveSSL" canGate="update" instantSave="instantSaveSSL" canGate="update" :canResource="$database" />
:canResource="$database" />
@else @else
<x-forms.checkbox id="enableSsl" label="Enable SSL" <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
wire:model.live="enableSsl" instantSave="instantSaveSSL" disabled instantSave="instantSaveSSL" disabled
helper="Database should be stopped to change this settings." /> helper="Database should be stopped to change this settings." />
@endif @endif
</div> </div>
@if ($enableSsl) @if ($enableSsl)
<div class="mx-2"> <div class="mx-2">
@if ($database->isExited()) @if ($database->isExited())
<x-forms.select id="sslMode" label="SSL Mode" <x-forms.select id="sslMode" label="SSL Mode" wire:model.live="sslMode"
wire:model.live="sslMode" instantSave="instantSaveSSL" instantSave="instantSaveSSL"
helper="Choose the SSL verification mode for PostgreSQL connections" canGate="update" helper="Choose the SSL verification mode for PostgreSQL connections" canGate="update"
:canResource="$database"> :canResource="$database">
<option value="allow" title="Allow insecure connections">allow (insecure)</option> <option value="allow" title="Allow insecure connections">allow (insecure)</option>
@ -131,8 +130,8 @@
</option> </option>
</x-forms.select> </x-forms.select>
@else @else
<x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL" <x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL" disabled
disabled helper="Database should be stopped to change this settings."> helper="Database should be stopped to change this settings.">
<option value="allow" title="Allow insecure connections">allow (insecure)</option> <option value="allow" title="Allow insecure connections">allow (insecure)</option>
<option value="prefer" title="Prefer secure connections">prefer (secure)</option> <option value="prefer" title="Prefer secure connections">prefer (secure)</option>
<option value="require" title="Require secure connections">require (secure)</option> <option value="require" title="Require secure connections">require (secure)</option>
@ -164,22 +163,24 @@
<x-forms.checkbox instantSave id="isPublic" label="Make it publicly available" <x-forms.checkbox instantSave id="isPublic" label="Make it publicly available"
canGate="update" :canResource="$database" /> canGate="update" :canResource="$database" />
</div> </div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}" <x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"
id="publicPort" label="Public Port" canGate="update" :canResource="$database" /> label="Public Port" canGate="update" :canResource="$database" />
</div> </div>
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="postgresConf"
id="postgresConf" canGate="update" :canResource="$database" /> canGate="update" :canResource="$database" />
</div> </div>
</div>
</div>
</form> </form>
<div class="flex flex-col gap-4 pt-4"> <div class="flex flex-col gap-4 pt-4">
<h3>Advanced</h3> <h3>Advanced</h3>
<div class="flex flex-col"> <div class="flex flex-col">
<x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings." <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs" instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs" canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
</div> </div>
<div class="pb-16"> <div class="pb-16">