Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: add cf tunnel to boarding server view

Browse Source
This commit is contained in:
Andras Bacsai 2023-12-04 09:29:55 +01:00
parent c6557eada8
commit f952512615
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/Boarding/Index.php
View File

@ -32,6 +32,7 @@ class Index extends Component
public ?int $remoteServerPort = 22;
public ?string $remoteServerUser = 'root';
public bool $isSwarmManager = false;
public bool $isCloudflareTunnel = false;
public ?Server $createdServer = null;
public Collection $projects;
@ -184,6 +185,7 @@ public function saveServer()
'team_id' => currentTeam()->id,
]);
$this->createdServer->settings->is_swarm_manager = $this->isSwarmManager;
$this->createdServer->settings->is_cloudflare_tunnel = $this->isCloudflareTunnel;
$this->createdServer->settings->save();
$this->createdServer->addInitialNetwork();
$this->validateServer();
@ -200,6 +202,7 @@ public function validateServer()
]);
} catch (\Throwable $e) {
$this->serverReachable = false;
$this->createdServer->delete();
return handleError(error: $e, livewire: $this);
}

2
app/Models/Server.php
View File

@ -87,8 +87,6 @@ public function settings()
return $this->hasOne(ServerSetting::class);
}
public function addInitialNetwork() {
ray($this->id);
if ($this->id === 0) {
if ($this->isSwarm()) {
SwarmDocker::create([

9
resources/views/livewire/boarding/index.blade.php
View File

@ -207,10 +207,11 @@
placeholder="Username to connect to your server. Default is root." label="Username"
id="remoteServerUser" />
</div>
{{-- <div class="w-64">
<x-forms.checkbox type="checkbox" id="isSwarmManager"
label="Is it a Swarm Manager?" />
</div> --}}
<div class="w-64">
<x-forms.checkbox
helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<br><span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
id="isCloudflareTunnel" label="Cloudflare Tunnel" />
</div>
<x-forms.button type="submit">Check Connection</x-forms.button>
</form>
</x-slot:actions>