Merge branch 'next' into improve-cleanup

2024-09-27 16:40:48 +02:00
parent f9dbc30812 96b8ddf664
commit 9a766aedc1
208 changed files with 3593 additions and 2772 deletions
--- a/app/Actions/Server/ConfigureCloudflared.php
+++ b/app/Actions/Server/ConfigureCloudflared.php
@@ -2,6 +2,7 @@

 namespace App\Actions\Server;

+use App\Events\CloudflareTunnelConfigured;
 use App\Models\Server;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Symfony\Component\Yaml\Yaml;
@@ -40,12 +41,17 @@ class ConfigureCloudflared
            instant_remote_process($commands, $server);
        } catch (\Throwable $e) {
            ray($e);
+            $server->settings->is_cloudflare_tunnel = false;
+            $server->settings->save();
            throw $e;
        } finally {
+            CloudflareTunnelConfigured::dispatch($server->team_id);
+
            $commands = collect([
                'rm -fr /tmp/cloudflared',
            ]);
            instant_remote_process($commands, $server);
+
        }
    }
 }