Merge pull request #3379 from peaklabs-dev/fix-#3343
Fix: Onboarding fails if SSH server uses other port than 22 and other onboarding improvements
This commit is contained in:
@@ -73,6 +73,8 @@ class Index extends Component
|
|||||||
}
|
}
|
||||||
$this->privateKeyName = generate_random_name();
|
$this->privateKeyName = generate_random_name();
|
||||||
$this->remoteServerName = generate_random_name();
|
$this->remoteServerName = generate_random_name();
|
||||||
|
$this->remoteServerPort = $this->remoteServerPort;
|
||||||
|
$this->remoteServerUser = $this->remoteServerUser;
|
||||||
if (isDev()) {
|
if (isDev()) {
|
||||||
$this->privateKey = '-----BEGIN OPENSSH PRIVATE KEY-----
|
$this->privateKey = '-----BEGIN OPENSSH PRIVATE KEY-----
|
||||||
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
|
||||||
@@ -154,6 +156,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
$this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
|
$this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
|
||||||
if ($this->servers->count() > 0) {
|
if ($this->servers->count() > 0) {
|
||||||
$this->selectedExistingServer = $this->servers->first()->id;
|
$this->selectedExistingServer = $this->servers->first()->id;
|
||||||
|
$this->updateServerDetails();
|
||||||
$this->currentState = 'select-existing-server';
|
$this->currentState = 'select-existing-server';
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@@ -173,9 +176,18 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
}
|
}
|
||||||
$this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
|
$this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
|
||||||
$this->serverPublicKey = $this->createdServer->privateKey->publicKey();
|
$this->serverPublicKey = $this->createdServer->privateKey->publicKey();
|
||||||
|
$this->updateServerDetails();
|
||||||
$this->currentState = 'validate-server';
|
$this->currentState = 'validate-server';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function updateServerDetails()
|
||||||
|
{
|
||||||
|
if ($this->createdServer) {
|
||||||
|
$this->remoteServerPort = $this->createdServer->port;
|
||||||
|
$this->remoteServerUser = $this->createdServer->user;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function getProxyType()
|
public function getProxyType()
|
||||||
{
|
{
|
||||||
// Set Default Proxy Type
|
// Set Default Proxy Type
|
||||||
@@ -235,11 +247,12 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
public function saveServer()
|
public function saveServer()
|
||||||
{
|
{
|
||||||
$this->validate([
|
$this->validate([
|
||||||
'remoteServerName' => 'required',
|
'remoteServerName' => 'required|string',
|
||||||
'remoteServerHost' => 'required',
|
'remoteServerHost' => 'required|string',
|
||||||
'remoteServerPort' => 'required|integer',
|
'remoteServerPort' => 'required|integer',
|
||||||
'remoteServerUser' => 'required',
|
'remoteServerUser' => 'required|string',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->privateKey = formatPrivateKey($this->privateKey);
|
$this->privateKey = formatPrivateKey($this->privateKey);
|
||||||
$foundServer = Server::whereIp($this->remoteServerHost)->first();
|
$foundServer = Server::whereIp($this->remoteServerHost)->first();
|
||||||
if ($foundServer) {
|
if ($foundServer) {
|
||||||
@@ -269,7 +282,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
public function validateServer()
|
public function validateServer()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
config()->set('coolify.mux_enabled', false);
|
config()->set('coolify.mux_enabled', true);
|
||||||
|
|
||||||
// EC2 does not have `uptime` command, lol
|
// EC2 does not have `uptime` command, lol
|
||||||
instant_remote_process(['ls /'], $this->createdServer, true);
|
instant_remote_process(['ls /'], $this->createdServer, true);
|
||||||
@@ -277,9 +290,13 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
$this->createdServer->settings()->update([
|
$this->createdServer->settings()->update([
|
||||||
'is_reachable' => true,
|
'is_reachable' => true,
|
||||||
]);
|
]);
|
||||||
|
$this->serverReachable = true;
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->serverReachable = false;
|
$this->serverReachable = false;
|
||||||
$this->createdServer->delete();
|
$this->createdServer->settings()->update([
|
||||||
|
'is_reachable' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
|
||||||
return handleError(error: $e, livewire: $this);
|
return handleError(error: $e, livewire: $this);
|
||||||
}
|
}
|
||||||
@@ -296,6 +313,9 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
]);
|
]);
|
||||||
$this->getProxyType();
|
$this->getProxyType();
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
$this->createdServer->settings()->update([
|
||||||
|
'is_usable' => false,
|
||||||
|
]);
|
||||||
return handleError(error: $e, livewire: $this);
|
return handleError(error: $e, livewire: $this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -349,6 +369,21 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function saveAndValidateServer()
|
||||||
|
{
|
||||||
|
$this->validate([
|
||||||
|
'remoteServerPort' => 'required|integer|min:1|max:65535',
|
||||||
|
'remoteServerUser' => 'required|string',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->createdServer->update([
|
||||||
|
'port' => $this->remoteServerPort,
|
||||||
|
'user' => $this->remoteServerUser,
|
||||||
|
'timezone' => 'UTC',
|
||||||
|
]);
|
||||||
|
$this->validateServer();
|
||||||
|
}
|
||||||
|
|
||||||
private function createNewPrivateKey()
|
private function createNewPrivateKey()
|
||||||
{
|
{
|
||||||
$this->privateKeyName = generate_random_name();
|
$this->privateKeyName = generate_random_name();
|
||||||
|
@@ -112,6 +112,16 @@ class Server extends BaseModel
|
|||||||
'proxy',
|
'proxy',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
protected $fillable = [
|
||||||
|
'name',
|
||||||
|
'ip',
|
||||||
|
'port',
|
||||||
|
'user',
|
||||||
|
'description',
|
||||||
|
'private_key_id',
|
||||||
|
'team_id',
|
||||||
|
];
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
public static function isReachable()
|
public static function isReachable()
|
||||||
|
@@ -1,16 +1,14 @@
|
|||||||
@php use App\Enums\ProxyTypes; @endphp
|
@php use App\Enums\ProxyTypes; @endphp
|
||||||
<x-slot:title>
|
<x-slot:title>
|
||||||
Onboarding | Coolify
|
Onboarding | Coolify
|
||||||
</x-slot>
|
</x-slot>
|
||||||
<section class="flex flex-col h-full lg:items-center lg:justify-center">
|
<section class="flex flex-col h-full lg:items-center lg:justify-center">
|
||||||
<div
|
<div class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border rounded-lg shadow lg:p-20 dark:bg-transparent dark:border-none max-w-7xl ">
|
||||||
class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border rounded-lg shadow lg:p-20 dark:bg-transparent dark:border-none max-w-7xl ">
|
|
||||||
@if ($currentState === 'welcome')
|
@if ($currentState === 'welcome')
|
||||||
<h1 class="text-3xl font-bold lg:text-5xl">Welcome to Coolify</h1>
|
<h1 class="text-3xl font-bold lg:text-5xl">Welcome to Coolify</h1>
|
||||||
<div class="py-6 text-center lg:text-xl">Let me help you set up the basics.</div>
|
<div class="py-6 text-center lg:text-xl">Let me help you set up the basics.</div>
|
||||||
<div class="flex justify-center ">
|
<div class="flex justify-center ">
|
||||||
<x-forms.button class="justify-center w-64 box-boarding"
|
<x-forms.button class="justify-center w-64 box-boarding" wire:click="$set('currentState','explanation')">Get
|
||||||
wire:click="$set('currentState','explanation')">Get
|
|
||||||
Started
|
Started
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
</div>
|
</div>
|
||||||
@@ -28,12 +26,15 @@
|
|||||||
<x-highlighted text="Self-hosting with superpowers!" /></span>
|
<x-highlighted text="Self-hosting with superpowers!" /></span>
|
||||||
</x-slot:question>
|
</x-slot:question>
|
||||||
<x-slot:explanation>
|
<x-slot:explanation>
|
||||||
<p><x-highlighted text="Task automation:" /> You don't need to manage your servers anymore.
|
<p>
|
||||||
|
<x-highlighted text="Task automation:" /> You don't need to manage your servers anymore.
|
||||||
Coolify does
|
Coolify does
|
||||||
it for you.</p>
|
it for you.</p>
|
||||||
<p><x-highlighted text="No vendor lock-in:" /> All configurations are stored on your servers, so
|
<p>
|
||||||
|
<x-highlighted text="No vendor lock-in:" /> All configurations are stored on your servers, so
|
||||||
everything works without a connection to Coolify (except integrations and automations).</p>
|
everything works without a connection to Coolify (except integrations and automations).</p>
|
||||||
<p><x-highlighted text="Monitoring:" />You can get notified on your favourite platforms
|
<p>
|
||||||
|
<x-highlighted text="Monitoring:" />You can get notified on your favourite platforms
|
||||||
(Discord,
|
(Discord,
|
||||||
Telegram, Email, etc.) when something goes wrong, or an action is needed from your side.</p>
|
Telegram, Email, etc.) when something goes wrong, or an action is needed from your side.</p>
|
||||||
</x-slot:explanation>
|
</x-slot:explanation>
|
||||||
@@ -45,41 +46,64 @@
|
|||||||
@elseif ($currentState === 'select-server-type')
|
@elseif ($currentState === 'select-server-type')
|
||||||
<x-boarding-step title="Server">
|
<x-boarding-step title="Server">
|
||||||
<x-slot:question>
|
<x-slot:question>
|
||||||
Do you want to deploy your resources to your <x-highlighted text="Localhost" />
|
Do you want to deploy your resources to your
|
||||||
or to a <x-highlighted text="Remote Server" />?
|
<x-highlighted text="Localhost" />
|
||||||
|
or to a
|
||||||
|
<x-highlighted text="Remote Server" />?
|
||||||
</x-slot:question>
|
</x-slot:question>
|
||||||
<x-slot:actions>
|
<x-slot:actions>
|
||||||
<x-forms.button class="justify-center w-64 box-boarding" wire:target="setServerType('localhost')"
|
<x-forms.button class="justify-center w-64 box-boarding" wire:target="setServerType('localhost')" wire:click="setServerType('localhost')">Localhost
|
||||||
wire:click="setServerType('localhost')">Localhost
|
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
|
|
||||||
<x-forms.button class="justify-center w-64 box-boarding " wire:target="setServerType('remote')"
|
<x-forms.button class="justify-center w-64 box-boarding " wire:target="setServerType('remote')" wire:click="setServerType('remote')">Remote Server
|
||||||
wire:click="setServerType('remote')">Remote Server
|
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
|
|
||||||
@if (!$serverReachable)
|
@if (!$serverReachable)
|
||||||
Localhost is not reachable with the following public key.
|
<div class="mt-6 p-4 bg-red-100 dark:bg-red-950 rounded-lg text-gray-800 dark:text-gray-200">
|
||||||
<br /> <br />
|
<h2 class="text-lg font-bold mb-2">Server is not reachable</h2>
|
||||||
Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for
|
<p class="mb-4">Please check the connection details below and correct them if they are incorrect.</p>
|
||||||
user or skip the boarding process and add a new private key manually to Coolify and to the
|
|
||||||
server.
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
|
||||||
<br />
|
<x-forms.input placeholder="Default is 22" label="Port" id="remoteServerPort" wire:model="remoteServerPort" :value="$remoteServerPort" />
|
||||||
Check this <a target="_blank" class="underline"
|
<div>
|
||||||
href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further
|
<x-forms.input placeholder="Default is root" label="User" id="remoteServerUser" wire:model="remoteServerUser" :value="$remoteServerUser" />
|
||||||
help.
|
<p class="text-xs mt-1">
|
||||||
<x-forms.input readonly id="serverPublicKey"></x-forms.input>
|
Non-root user is experimental:
|
||||||
<x-forms.button class="lg:w-64 box-boarding" wire:target="setServerType('localhost')"
|
<a class="font-bold underline" target="_blank" href="https://coolify.io/docs/knowledge-base/server/non-root-user">docs</a>
|
||||||
wire:click="setServerType('localhost')">Check again
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-4">
|
||||||
|
<p class="mb-2">If the connection details are correct, please ensure:</p>
|
||||||
|
<ul class="list-disc list-inside">
|
||||||
|
<li>The correct public key is in your <code class="bg-red-200 dark:bg-red-900 px-1 rounded">~/.ssh/authorized_keys</code> file for the specified user</li>
|
||||||
|
<li>Or skip the boarding process and manually add a new private key to Coolify and the server</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p class="mb-4">
|
||||||
|
For more help, check this <a target="_blank" class="underline font-semibold" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<x-forms.input readonly id="serverPublicKey" class="mb-4" label="Current Public Key"></x-forms.input>
|
||||||
|
|
||||||
|
<x-forms.button class="w-full md:w-auto box-boarding" wire:click="saveAndValidateServer">
|
||||||
|
Check again
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</x-slot:actions>
|
</x-slot:actions>
|
||||||
<x-slot:explanation>
|
<x-slot:explanation>
|
||||||
<p>Servers are the main building blocks, as they will host your applications, databases,
|
<p>Servers are the main building blocks, as they will host your applications, databases,
|
||||||
services, called resources. Any CPU intensive process will use the server's CPU where you
|
services, called resources. Any CPU intensive process will use the server's CPU where you
|
||||||
are deploying your resources.</p>
|
are deploying your resources.</p>
|
||||||
<p><x-highlighted text="Localhost" /> is the server where Coolify is running on. It is not
|
<p>
|
||||||
|
<x-highlighted text="Localhost" /> is the server where Coolify is running on. It is not
|
||||||
recommended to use one server
|
recommended to use one server
|
||||||
for everything.</p>
|
for everything.</p>
|
||||||
<p><x-highlighted text="A remote server" /> is a server reachable through SSH. It can be hosted
|
<p>
|
||||||
|
<x-highlighted text="A remote server" /> is a server reachable through SSH. It can be hosted
|
||||||
at home, or from any cloud
|
at home, or from any cloud
|
||||||
provider.</p>
|
provider.</p>
|
||||||
</x-slot:explanation>
|
</x-slot:explanation>
|
||||||
@@ -90,11 +114,9 @@
|
|||||||
Do you have your own SSH Private Key?
|
Do you have your own SSH Private Key?
|
||||||
</x-slot:question>
|
</x-slot:question>
|
||||||
<x-slot:actions>
|
<x-slot:actions>
|
||||||
<x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('own')"
|
<x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('own')" wire:click="setPrivateKey('own')">Yes
|
||||||
wire:click="setPrivateKey('own')">Yes
|
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
<x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('create')"
|
<x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('create')" wire:click="setPrivateKey('create')">No (create one for me)
|
||||||
wire:click="setPrivateKey('create')">No (create one for me)
|
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
@if (count($privateKeys) > 0)
|
@if (count($privateKeys) > 0)
|
||||||
<form wire:submit='selectExistingPrivateKey' class="flex flex-col w-full gap-4 lg:pr-10">
|
<form wire:submit='selectExistingPrivateKey' class="flex flex-col w-full gap-4 lg:pr-10">
|
||||||
@@ -125,11 +147,7 @@
|
|||||||
<x-slot:actions>
|
<x-slot:actions>
|
||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
<div>
|
<div>
|
||||||
<x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewServer">No
|
<x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewServer">No (create one for me)
|
||||||
(create
|
|
||||||
one
|
|
||||||
for
|
|
||||||
me)
|
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -145,20 +163,39 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@if (!$serverReachable)
|
@if (!$serverReachable)
|
||||||
This server is not reachable with the following public key.
|
<div class="mt-6 p-4 bg-red-100 dark:bg-red-950 rounded-lg text-gray-800 dark:text-gray-200">
|
||||||
<br /> <br />
|
<h2 class="text-lg font-bold mb-2">Server is not reachable</h2>
|
||||||
Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for
|
<p class="mb-4">Please check the connection details below and correct them if they are incorrect.</p>
|
||||||
user or skip the boarding process and add a new private key manually to Coolify and to the
|
|
||||||
server.
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
|
||||||
<br />
|
<x-forms.input placeholder="Default is 22" label="Port" id="remoteServerPort" wire:model="remoteServerPort" :value="$remoteServerPort" />
|
||||||
Check this <a target="_blank" class="underline"
|
<div>
|
||||||
href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further
|
<x-forms.input placeholder="Default is root" label="User" id="remoteServerUser" wire:model="remoteServerUser" :value="$remoteServerUser" />
|
||||||
help.
|
<p class="text-xs mt-1">
|
||||||
<x-forms.input readonly id="serverPublicKey"></x-forms.input>
|
Non-root user is experimental:
|
||||||
<x-forms.button class="w-64 box-boarding" wire:target="validateServer"
|
<a class="font-bold underline" target="_blank" href="https://coolify.io/docs/knowledge-base/server/non-root-user">docs</a>
|
||||||
wire:click="validateServer">Check
|
</p>
|
||||||
again
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-4">
|
||||||
|
<p class="mb-2">If the connection details are correct, please ensure:</p>
|
||||||
|
<ul class="list-disc list-inside">
|
||||||
|
<li>The correct public key is in your <code class="bg-red-200 dark:bg-red-900 px-1 rounded">~/.ssh/authorized_keys</code> file for the specified user</li>
|
||||||
|
<li>Or skip the boarding process and manually add a new private key to Coolify and the server</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p class="mb-4">
|
||||||
|
For more help, check this <a target="_blank" class="underline font-semibold" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<x-forms.input readonly id="serverPublicKey" class="mb-4" label="Current Public Key"></x-forms.input>
|
||||||
|
|
||||||
|
<x-forms.button class="w-full md:w-auto box-boarding" wire:click="saveAndValidateServer">
|
||||||
|
Check again
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</x-slot:actions>
|
</x-slot:actions>
|
||||||
<x-slot:explanation>
|
<x-slot:explanation>
|
||||||
@@ -176,12 +213,9 @@
|
|||||||
</x-slot:question>
|
</x-slot:question>
|
||||||
<x-slot:actions>
|
<x-slot:actions>
|
||||||
<form wire:submit='savePrivateKey' class="flex flex-col w-full gap-4 lg:pr-10">
|
<form wire:submit='savePrivateKey' class="flex flex-col w-full gap-4 lg:pr-10">
|
||||||
<x-forms.input required placeholder="Choose a name for your Private Key. Could be anything."
|
<x-forms.input required placeholder="Choose a name for your Private Key. Could be anything." label="Name" id="privateKeyName" />
|
||||||
label="Name" id="privateKeyName" />
|
<x-forms.input placeholder="Description, so others will know more about this." label="Description" id="privateKeyDescription" />
|
||||||
<x-forms.input placeholder="Description, so others will know more about this."
|
<x-forms.textarea required placeholder="-----BEGIN OPENSSH PRIVATE KEY-----" label="Private Key" id="privateKey" />
|
||||||
label="Description" id="privateKeyDescription" />
|
|
||||||
<x-forms.textarea required placeholder="-----BEGIN OPENSSH PRIVATE KEY-----" label="Private Key"
|
|
||||||
id="privateKey" />
|
|
||||||
@if ($privateKeyType === 'create')
|
@if ($privateKeyType === 'create')
|
||||||
<x-forms.textarea rows="7" readonly label="Public Key" id="publicKey" />
|
<x-forms.textarea rows="7" readonly label="Public Key" id="publicKey" />
|
||||||
<span class="font-bold dark:text-warning">ACTION REQUIRED: Copy the 'Public Key' to your
|
<span class="font-bold dark:text-warning">ACTION REQUIRED: Copy the 'Public Key' to your
|
||||||
@@ -208,28 +242,27 @@
|
|||||||
<x-slot:actions>
|
<x-slot:actions>
|
||||||
<form wire:submit='saveServer' class="flex flex-col w-full gap-4 lg:pr-10">
|
<form wire:submit='saveServer' class="flex flex-col w-full gap-4 lg:pr-10">
|
||||||
<div class="flex flex-col gap-2 lg:flex-row">
|
<div class="flex flex-col gap-2 lg:flex-row">
|
||||||
<x-forms.input required placeholder="Choose a name for your Server. Could be anything."
|
<x-forms.input required placeholder="Choose a name for your Server. Could be anything." label="Name" id="remoteServerName" wire:model="remoteServerName" />
|
||||||
label="Name" id="remoteServerName" />
|
<x-forms.input placeholder="Description, so others will know more about this." label="Description" id="remoteServerDescription" wire:model="remoteServerDescription" />
|
||||||
<x-forms.input placeholder="Description, so others will know more about this."
|
|
||||||
label="Description" id="remoteServerDescription" />
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col gap-2 lg:flex-row ">
|
<div class="flex flex-col gap-2 lg:flex-row ">
|
||||||
<x-forms.input required placeholder="127.0.0.1" label="IP Address" id="remoteServerHost" />
|
<x-forms.input required placeholder="127.0.0.1" label="IP Address" id="remoteServerHost" wire:model="remoteServerHost" />
|
||||||
<x-forms.input required placeholder="Port number of your server. Default is 22."
|
</div>
|
||||||
label="Port" id="remoteServerPort" />
|
<div x-data="{ showAdvanced: false }" class="flex flex-col gap-2">
|
||||||
|
<button @click="showAdvanced = !showAdvanced" type="button" class="text-left text-sm text-gray-600 dark:text-gray-300 hover:underline">
|
||||||
|
Advanced Settings
|
||||||
|
</button>
|
||||||
|
<div x-show="showAdvanced" class="flex flex-col gap-2 lg:flex-row">
|
||||||
|
<x-forms.input placeholder="Port number of your server. Default is 22." label="Port" id="remoteServerPort" wire:model="remoteServerPort" />
|
||||||
<div class="w-full">
|
<div class="w-full">
|
||||||
<x-forms.input required placeholder="User to connect to your server. Default is root."
|
<x-forms.input placeholder="Default is root." label="User" id="remoteServerUser" wire:model="remoteServerUser" />
|
||||||
label="User" id="remoteServerUser" />
|
<div class="text-xs text-gray-600 dark:text-gray-300">Non-root user is experimental: <a class="font-bold underline" target="_blank" href="https://coolify.io/docs/knowledge-base/server/non-root-user">docs</a>.
|
||||||
<div class="text-xs dark:text-warning text-coollabs ">Non-root user is experimental: <a
|
</div>
|
||||||
class="font-bold underline" target="_blank"
|
|
||||||
href="https://coolify.io/docs/knowledge-base/server/non-root-user">docs</a>.
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="lg:w-64">
|
<div class="lg:w-64">
|
||||||
<x-forms.checkbox
|
<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='dark:text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>" id="isCloudflareTunnel" label="Cloudflare Tunnel" wire:model="isCloudflareTunnel" />
|
||||||
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/setup Cloudflare (cloudflared) on your server.</span>"
|
|
||||||
id="isCloudflareTunnel" label="Cloudflare Tunnel" />
|
|
||||||
</div>
|
</div>
|
||||||
<x-forms.button type="submit">Continue</x-forms.button>
|
<x-forms.button type="submit">Continue</x-forms.button>
|
||||||
</form>
|
</form>
|
||||||
@@ -247,8 +280,7 @@
|
|||||||
<x-slot:content>
|
<x-slot:content>
|
||||||
<livewire:server.validate-and-install :server="$this->createdServer" />
|
<livewire:server.validate-and-install :server="$this->createdServer" />
|
||||||
</x-slot:content>
|
</x-slot:content>
|
||||||
<x-forms.button @click="slideOverOpen=true" class="w-full font-bold box-boarding lg:w-96"
|
<x-forms.button @click="slideOverOpen=true" class="w-full font-bold box-boarding lg:w-96" wire:click.prevent='installServer' isHighlighted>
|
||||||
wire:click.prevent='installServer' isHighlighted>
|
|
||||||
Let's do it!
|
Let's do it!
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
</x-slide-over>
|
</x-slide-over>
|
||||||
@@ -257,8 +289,7 @@
|
|||||||
<p>This will install the latest Docker Engine on your server, configure a few things to be able
|
<p>This will install the latest Docker Engine on your server, configure a few things to be able
|
||||||
to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install
|
to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install
|
||||||
Docker
|
Docker
|
||||||
Engine, check <a target="_blank" class="underline dark:text-warning"
|
Engine, check <a target="_blank" class="underline dark:text-warning" href="https://docs.docker.com/engine/install/#server">this
|
||||||
href="https://docs.docker.com/engine/install/#server">this
|
|
||||||
documentation</a>.</p>
|
documentation</a>.</p>
|
||||||
</x-slot:explanation>
|
</x-slot:explanation>
|
||||||
</x-boarding-step>
|
</x-boarding-step>
|
||||||
@@ -321,8 +352,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<x-modal-input title="How can we help?">
|
<x-modal-input title="How can we help?">
|
||||||
<x-slot:content>
|
<x-slot:content>
|
||||||
<div class="w-full text-center cursor-pointer hover:underline dark:hover:text-white"
|
<div class="w-full text-center cursor-pointer hover:underline dark:hover:text-white" title="Send us feedback or get help!">
|
||||||
title="Send us feedback or get help!">
|
|
||||||
Feedback
|
Feedback
|
||||||
</div>
|
</div>
|
||||||
</x-slot:content>
|
</x-slot:content>
|
||||||
@@ -330,4 +360,4 @@
|
|||||||
</x-modal-input>
|
</x-modal-input>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
Reference in New Issue
Block a user