Merge pull request #1911 from coollabsio/next

v4.0.0-beta.248

app/Console/Commands/Init.php

@@ -34,11 +34,13 @@ public function handle()
             $this->cleanup_stucked_helper_containers();
             $this->call('cleanup:queue');
             $this->call('cleanup:stucked-resources');
-            try {
+            if (!isCloud()) {
-                $server = Server::find(0)->first();
+                try {
-                $server->setupDynamicProxyConfiguration();
+                    $server = Server::find(0)->first();
-            } catch (\Throwable $e) {
+                    $server->setupDynamicProxyConfiguration();
-                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                } catch (\Throwable $e) {
+                    echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                }
             }
 
             $settings = InstanceSettings::get();

app/Livewire/Server/ConfigureCloudflareTunnels.php

@@ -10,6 +10,7 @@ class ConfigureCloudflareTunnels extends Component
 {
     public $server_id;
     public string $cloudflare_token;
+    public string $ssh_domain;
     public function alreadyConfigured()
     {
         try {
@@ -28,6 +29,8 @@ public function submit()
             $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
             ConfigureCloudflared::run($server, $this->cloudflare_token);
             $server->settings->is_cloudflare_tunnel = true;
+            $server->ip = $this->ssh_domain;
+            $server->save();
             $server->settings->save();
             $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
             $this->dispatch('serverInstalled');

config/sentry.php

@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.247',
+    'release' => '4.0.0-beta.248',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.247';
+return '4.0.0-beta.248';

resources/views/livewire/server/configure-cloudflare-tunnels.blade.php

@@ -1,9 +1,8 @@
 <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="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" isHighlighted @click="modalOpen=false">Automated Configuration (experimental)</x-forms.button>
     <h3 class="text-center">Or</h3>
-    <x-forms.button wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I already configured the tunnel
+    <x-forms.button  wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I have already set up the tunnel manually on the server.</x-forms.button>
-        manually on the server</x-forms.button>
 </form>

resources/views/livewire/server/form.blade.php

@@ -80,13 +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"
                                 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>
-                        {{-- @if ($server->settings->is_cloudflare_tunnel) --}}
+                        @if ($server->settings->is_cloudflare_tunnel)
-                            <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel"
+                            <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
-                                label="Enabled" />
+                        @else
-                        {{-- @endif --}}
+                            <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>
                         <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>.
@@ -112,8 +112,19 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                         @endif
                     @endif
                 @else
-                <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel"
+                    <div class="flex items-center gap-1 pt-6">
-                label="Enabled" />
+                        <h3 class="">Cloudflare Tunnels
+                        </h3>
+                        <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>" />
+                    </div>
+                    @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
 
             </div>

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.247"
+            "version": "4.0.0-beta.248"
         }
     }
 }