mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-23 00:24:15 +02:00
Add SSH domain field and save server IP in ConfigureCloudflareTunnels.php
This commit is contained in:
parent
518004afbc
commit
c0a4a5c2f5
@ -10,6 +10,7 @@ class ConfigureCloudflareTunnels extends Component
|
|||||||
{
|
{
|
||||||
public $server_id;
|
public $server_id;
|
||||||
public string $cloudflare_token;
|
public string $cloudflare_token;
|
||||||
|
public string $ssh_domain;
|
||||||
public function alreadyConfigured()
|
public function alreadyConfigured()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@ -28,6 +29,8 @@ public function submit()
|
|||||||
$server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
|
$server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
|
||||||
ConfigureCloudflared::run($server, $this->cloudflare_token);
|
ConfigureCloudflared::run($server, $this->cloudflare_token);
|
||||||
$server->settings->is_cloudflare_tunnel = true;
|
$server->settings->is_cloudflare_tunnel = true;
|
||||||
|
$server->ip = $this->ssh_domain;
|
||||||
|
$server->save();
|
||||||
$server->settings->save();
|
$server->settings->save();
|
||||||
$this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
|
$this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
|
||||||
$this->dispatch('serverInstalled');
|
$this->dispatch('serverInstalled');
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
|
<form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
|
||||||
<x-forms.input id="cloudflare_token" required label="Cloudflare Token" />
|
<x-forms.input id="cloudflare_token" required label="Cloudflare Token" />
|
||||||
<x-forms.input id="ssh_domain" label="Configured SSH Domain" required
|
<x-forms.input id="ssh_domain" label="Configured SSH Domain" required
|
||||||
helper="ssh://localhost configured in Cloudflare" />
|
helper="The SSH Domain you configured in Cloudflare" />
|
||||||
<x-forms.button type="submit">Configure</x-forms.button>
|
<x-forms.button type="submit" @click="modalOpen=false">Configure</x-forms.button>
|
||||||
<h3 class="text-center">Or</h3>
|
<h3 class="text-center">Or</h3>
|
||||||
<x-forms.button wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I already configured the tunnel
|
<x-forms.button isError wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I already configured the tunnel
|
||||||
manually on the server</x-forms.button>
|
manually on the server</x-forms.button>
|
||||||
</form>
|
</form>
|
||||||
|
@ -80,12 +80,13 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
|
|||||||
<x-helper class="inline-flex"
|
<x-helper class="inline-flex"
|
||||||
helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
|
helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
|
||||||
</div>
|
</div>
|
||||||
{{-- @if ($server->settings->is_cloudflare_tunnel) --}}
|
@if ($server->settings->is_cloudflare_tunnel)
|
||||||
<x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
|
<x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
|
||||||
{{-- @endif --}}
|
@else
|
||||||
{{-- <x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
|
<x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
|
||||||
<livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
|
<livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
|
||||||
</x-modal-input> --}}
|
</x-modal-input>
|
||||||
|
@endif
|
||||||
<h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
|
<h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
|
||||||
<div class="pb-4">Read the docs <a class='underline dark:text-white'
|
<div class="pb-4">Read the docs <a class='underline dark:text-white'
|
||||||
href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>.
|
href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>.
|
||||||
@ -117,7 +118,13 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
|
|||||||
<x-helper class="inline-flex"
|
<x-helper class="inline-flex"
|
||||||
helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
|
helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
|
||||||
</div>
|
</div>
|
||||||
<x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
|
@if ($server->settings->is_cloudflare_tunnel)
|
||||||
|
<x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
|
||||||
|
@else
|
||||||
|
<x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
|
||||||
|
<livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
|
||||||
|
</x-modal-input>
|
||||||
|
@endif
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user