Merge pull request #1776 from coollabsio/next

4.0.0-beta.225
2024-02-26 11:08:53 +01:00 · 2024-02-26 11:08:53 +01:00 · 74092ea95b
commit 74092ea95b
parent 8c803f1c4b b67abe58e8
50 changed files with 618 additions and 129 deletions
--- a/app/Console/Commands/CleanupDatabase.php
+++ b/app/Console/Commands/CleanupDatabase.php
@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class CleanupDatabase extends Command
+{
+    protected $signature = 'cleanup:database {--yes}';
+    protected $description = 'Cleanup database';
+
+    public function handle()
+    {
+        echo "Running database cleanup...\n";
+        $keep_days = 60;
+
+        // Cleanup failed jobs table
+        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7));
+        $count = $failed_jobs->count();
+        echo "Delete $count entries from failed_jobs.\n";
+        if ($this->option('yes')) {
+            $failed_jobs->delete();
+        }
+
+        // Cleanup sessions table
+        $sessions = DB::table('sessions')->where('last_activity', '<', now()->subDays($keep_days)->timestamp);
+        $count = $sessions->count();
+        echo "Delete $count entries from sessions.\n";
+        if ($this->option('yes')) {
+            $sessions->delete();
+        }
+
+        // Cleanup activity_log table
+        $activity_log = DB::table('activity_log')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $activity_log->count();
+        echo "Delete $count entries from activity_log.\n";
+        if ($this->option('yes')) {
+            $activity_log->delete();
+        }
+
+        // Cleanup application_deployment_queues table
+        $application_deployment_queues = DB::table('application_deployment_queues')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $application_deployment_queues->count();
+        echo "Delete $count entries from application_deployment_queues.\n";
+        if ($this->option('yes')) {
+            $application_deployment_queues->delete();
+        }
+
+        // Cleanup webhooks table
+        $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $webhooks->count();
+        echo "Delete $count entries from webhooks.\n";
+        if ($this->option('yes')) {
+            $webhooks->delete();
+        }
+
+    }
+}
--- a/app/Console/Commands/CleanupUnreachableServers.php
+++ b/app/Console/Commands/CleanupUnreachableServers.php
@ -8,15 +8,16 @@
 class CleanupUnreachableServers extends Command
 {
    protected $signature = 'cleanup:unreachable-servers';
-    protected $description = 'Cleanup Unreachable Servers (3 days)';
+    protected $description = 'Cleanup Unreachable Servers (7 days)';

    public function handle()
    {
        echo "Running unreachable server cleanup...\n";
-        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(3))->get();
+        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
        if ($servers->count() > 0) {
            foreach ($servers as $server) {
                echo "Cleanup unreachable server ($server->id) with name $server->name";
+                send_internal_notification("Server $server->name is unreachable for 7 days. Cleaning up...");
                $server->update([
                    'ip' => '1.2.3.4'
                ]);
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@ -69,12 +69,34 @@ private function check_resources($schedule)
        }
        foreach ($containerServers as $server) {
            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            // $schedule
+            //     ->call(function () use ($server) {
+            //         $randomSeconds = rand(1, 40);
+            //         $job = new ContainerStatusJob($server);
+            //         $job->delay($randomSeconds);
+            //         ray('dispatching container status job in ' . $randomSeconds . ' seconds');
+            //         dispatch($job);
+            //     })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
            if ($server->isLogDrainEnabled()) {
                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+                // $schedule
+                //     ->call(function () use ($server) {
+                //         $randomSeconds = rand(1, 40);
+                //         $job = new CheckLogDrainContainerJob($server);
+                //         $job->delay($randomSeconds);
+                //         dispatch($job);
+                //     })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
            }
        }
        foreach ($servers as $server) {
            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
+            // $schedule
+            //     ->call(function () use ($server) {
+            //         $randomSeconds = rand(1, 40);
+            //         $job = new ServerStatusJob($server);
+            //         $job->delay($randomSeconds);
+            //         dispatch($job);
+            //     })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
        }
    }
    private function instance_auto_update($schedule)
--- a/app/Http/Controllers/Api/Deploy.php
+++ b/app/Http/Controllers/Api/Deploy.php
@ -14,7 +14,7 @@
 use Illuminate\Support\Collection;
 use Visus\Cuid2\Cuid2;

-class Deploy extends Controller
+class APIDeploy extends Controller
 {
    public function deploy(Request $request)
    {
--- a/app/Http/Controllers/Api/Project.php
+++ b/app/Http/Controllers/Api/Project.php
@ -6,7 +6,7 @@
 use App\Models\Project as ModelsProject;
 use Illuminate\Http\Request;

-class Project extends Controller
+class APIProject extends Controller
 {
    public function projects(Request $request)
    {
--- a/app/Http/Controllers/Api/Server.php
+++ b/app/Http/Controllers/Api/Server.php
@ -6,7 +6,7 @@
 use App\Models\Server as ModelsServer;
 use Illuminate\Http\Request;

-class Server extends Controller
+class APIServer extends Controller
 {
    public function servers(Request $request)
    {
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@ -1223,6 +1223,19 @@ private function generate_compose_file()
        if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
            $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
            if (count($custom_compose) > 0) {
+                $ipv4 = data_get($custom_compose, 'ip.0');
+                $ipv6 = data_get($custom_compose, 'ip6.0');
+                data_forget($custom_compose, 'ip');
+                data_forget($custom_compose, 'ip6');
+                if ($ipv4 || $ipv6) {
+                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                }
+                if ($ipv4) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                }
+                if ($ipv6) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                }
                $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
            }
        } else {
@ -1230,6 +1243,19 @@ private function generate_compose_file()
            data_forget($docker_compose, 'services.' . $this->container_name);
            $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
            if (count($custom_compose) > 0) {
+                $ipv4 = data_get($custom_compose, 'ip.0');
+                $ipv6 = data_get($custom_compose, 'ip6.0');
+                data_forget($custom_compose, 'ip');
+                data_forget($custom_compose, 'ip6');
+                if ($ipv4 || $ipv6) {
+                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                }
+                if ($ipv4) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                }
+                if ($ipv6) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                }
                $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
            }
        }
@ -1649,7 +1675,6 @@ public function failed(Throwable $exception): void
                );
            }
        }
-
        $this->next(ApplicationDeploymentStatus::FAILED->value);
    }
 }
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@ -43,6 +43,10 @@ public function uniqueId(): int

    public function handle()
    {
+        if (!$this->server->isFunctional()) {
+            return 'Server is not ready.';
+        };
+
        $applications = $this->server->applications();
        $skip_these_applications = collect([]);
        foreach ($applications as $application) {
@ -57,10 +61,6 @@ public function handle()
        $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
            return !$skip_these_applications->pluck('id')->contains($value->id);
        });
-
-        if (!$this->server->isFunctional()) {
-            return 'Server is not ready.';
-        };
        try {
            if ($this->server->isSwarm()) {
                $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
--- a/app/Jobs/ServerLimitCheckJob.php
+++ b/app/Jobs/ServerLimitCheckJob.php
@ -0,0 +1,68 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use App\Notifications\Server\ForceDisabled;
+use App\Notifications\Server\ForceEnabled;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerLimitCheckJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public Team $team)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->team->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->team->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $servers = $this->team->servers;
+            $servers_count = $servers->count();
+            $limit = $this->team->limits['serverLimit'];
+            $number_of_servers_to_disable = $servers_count - $limit;
+            ray('ServerLimitCheckJob', $this->team->uuid, $servers_count, $limit, $number_of_servers_to_disable);
+            if ($number_of_servers_to_disable > 0) {
+                ray('Disabling servers');
+                $servers = $servers->sortbyDesc('created_at');
+                $servers_to_disable = $servers->take($number_of_servers_to_disable);
+                $servers_to_disable->each(function ($server) {
+                    $server->forceDisableServer();
+                    $this->team->notify(new ForceDisabled($server));
+                });
+            } else if ($number_of_servers_to_disable === 0) {
+                $servers->each(function ($server) {
+                    if ($server->isForceDisabled()) {
+                        $server->forceEnableServer();
+                        $this->team->notify(new ForceEnabled($server));
+                    }
+                });
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerLimitCheckJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}
--- a/app/Jobs/ServerStatusJob.php
+++ b/app/Jobs/ServerStatusJob.php
@ -41,15 +41,6 @@ public function handle()
            throw new \RuntimeException('Server is not ready.');
        };
        try {
-            // $this->server->validateConnection();
-            // $this->server->validateOS();
-            // $docker_installed = $this->server->validateDockerEngine();
-            // if (!$docker_installed) {
-            //     $this->server->installDocker();
-            //     $this->server->validateDockerEngine();
-            // }
-
-            // $this->server->validateDockerEngineVersion();
            if ($this->server->isFunctional()) {
                $this->cleanup(notify: false);
            }
--- a/app/Livewire/Admin/Index.php
+++ b/app/Livewire/Admin/Index.php
@ -3,6 +3,7 @@
 namespace App\Livewire\Admin;

 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Livewire\Component;

@ -27,6 +28,7 @@ public function switchUser(int $user_id)
        auth()->login($user);

        if ($user_id === 0) {
+            Cache::forget('team:0');
            session()->forget('adminToken');
        } else {
            $token_payload = [
@ -35,6 +37,7 @@ public function switchUser(int $user_id)
            $token = Crypt::encrypt($token_payload);
            session(['adminToken' => $token]);
        }
+        session()->regenerate();
        return refreshSession();
    }
    public function render()
--- a/app/Livewire/LayoutPopups.php
+++ b/app/Livewire/LayoutPopups.php
@ -4,7 +4,7 @@

 use Livewire\Component;

-class Sponsorship extends Component
+class LayoutPopups extends Component
 {
    public function getListeners()
    {
@ -23,6 +23,6 @@ public function disable()
    }
    public function render()
    {
-        return view('livewire.sponsorship');
+        return view('livewire.layout-popups');
    }
 }
--- a/app/Livewire/Server/Create.php
+++ b/app/Livewire/Server/Create.php
@ -3,6 +3,7 @@
 namespace App\Livewire\Server;

 use App\Models\PrivateKey;
+use App\Models\Team;
 use Livewire\Component;

 class Create extends Component
@ -16,11 +17,7 @@ public function mount()
            $this->limit_reached = false;
            return;
        }
-        $team = currentTeam();
-        $servers = $team->servers->count();
-        ['serverLimit' => $serverLimit] = $team->limits;
-
-        $this->limit_reached = $servers >= $serverLimit;
+        $this->limit_reached = Team::serverLimitReached();
    }
    public function render()
    {
--- a/app/Livewire/Server/New/ByIp.php
+++ b/app/Livewire/Server/New/ByIp.php
@ -5,6 +5,7 @@
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Models\Server;
+use App\Models\Team;
 use Livewire\Component;

 class ByIp extends Component
@ -76,6 +77,9 @@ public function submit()
            if (is_null($this->private_key_id)) {
                return $this->dispatch('error', 'You must select a private key');
            }
+            if (Team::serverLimitReached()) {
+                return $this->dispatch('error', 'You have reached the server limit for your subscription.');
+            }
            $payload = [
                'name' => $this->name,
                'description' => $this->description,
--- a/app/Livewire/Subscription/Actions.php
+++ b/app/Livewire/Subscription/Actions.php
@ -2,17 +2,17 @@

 namespace App\Livewire\Subscription;

+use App\Models\Team;
 use Illuminate\Support\Facades\Http;
 use Livewire\Component;

 class Actions extends Component
 {
    public $server_limits = 0;
+    
    public function mount()
    {
-        $limits = currentTeam()->limits;
-        $this->server_limits = data_get($limits, 'serverLimit', 0);
-
+        $this->server_limits = Team::serverLimit();
    }
    public function cancel()
    {
--- a/app/Livewire/Subscription/PricingPlans.php
+++ b/app/Livewire/Subscription/PricingPlans.php
@ -9,8 +9,9 @@
 class PricingPlans extends Component
 {
    public bool $isTrial = false;
-    public function mount() {
-        $this->isTrial = !data_get(currentTeam(),'subscription.stripe_trial_already_ended');
+    public function mount()
+    {
+        $this->isTrial = !data_get(currentTeam(), 'subscription.stripe_trial_already_ended');
        if (config('constants.limits.trial_period') == 0) {
            $this->isTrial = false;
        }
@ -26,15 +27,15 @@ public function subscribeStripe($type)
            case 'basic-yearly':
                $priceId = config('subscription.stripe_price_id_basic_yearly');
                break;
-            case 'ultimate-monthly':
-                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
-                break;
            case 'pro-monthly':
                $priceId = config('subscription.stripe_price_id_pro_monthly');
                break;
            case 'pro-yearly':
                $priceId = config('subscription.stripe_price_id_pro_yearly');
                break;
+            case 'ultimate-monthly':
+                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
+                break;
            case 'ultimate-yearly':
                $priceId = config('subscription.stripe_price_id_ultimate_yearly');
                break;
@ -64,18 +65,25 @@ public function subscribeStripe($type)
            'success_url' => route('dashboard', ['success' => true]),
            'cancel_url' => route('subscription.index', ['cancelled' => true]),
        ];
-
-        if (!data_get($team,'subscription.stripe_trial_already_ended')) {
-            if (config('constants.limits.trial_period') > 0) {
-            $payload['subscription_data'] = [
-                'trial_period_days' => config('constants.limits.trial_period'),
-                'trial_settings' => [
-                    'end_behavior' => [
-                        'missing_payment_method' => 'cancel',
-                    ]
-                ],
+        if (str($type)->contains('ultimate')) {
+            $payload['line_items'][0]['adjustable_quantity'] = [
+                'enabled' => true,
+                'minimum' => 10,
            ];
+            $payload['line_items'][0]['quantity'] = 10;
        }
+
+        if (!data_get($team, 'subscription.stripe_trial_already_ended')) {
+            if (config('constants.limits.trial_period') > 0) {
+                $payload['subscription_data'] = [
+                    'trial_period_days' => config('constants.limits.trial_period'),
+                    'trial_settings' => [
+                        'end_behavior' => [
+                            'missing_payment_method' => 'cancel',
+                        ]
+                    ],
+                ];
+            }
            $payload['payment_method_collection'] = 'if_required';
        }
        $customer = currentTeam()->subscription?->stripe_customer_id ?? null;
--- a/app/Livewire/Tags/Show.php
+++ b/app/Livewire/Tags/Show.php
@ -2,7 +2,7 @@

 namespace App\Livewire\Tags;

-use App\Http\Controllers\Api\Deploy;
+use App\Http\Controllers\Api\APIDeploy as Deploy;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Tag;
 use Livewire\Component;
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@ -69,7 +70,7 @@ static public function ownedByCurrentTeam(array $select = ['*'])

    static public function isUsable()
    {
-        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false);
+        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false)->whereRelation('settings', 'force_disabled', false);
    }

    static public function destinationsByServer(string $server_id)
@ -149,8 +150,31 @@ public function skipServer()
            ray('skipping 1.2.3.4');
            return true;
        }
+        if ($this->settings->force_disabled === true) {
+            ray('force_disabled');
+            return true;
+        }
        return false;
    }
+    public function isForceDisabled()
+    {
+        return $this->settings->force_disabled;
+    }
+    public function forceEnableServer()
+    {
+        $this->settings->update([
+            'force_disabled' => false,
+        ]);
+    }
+    public function forceDisableServer()
+    {
+        $this->settings->update([
+            'force_disabled' => true,
+        ]);
+        $sshKeyFileLocation = "id.root@{$this->uuid}";
+        Storage::disk('ssh-keys')->delete($sshKeyFileLocation);
+        Storage::disk('ssh-mux')->delete($this->muxFilename());
+    }
    public function isServerReady(int $tries = 3)
    {
        if ($this->skipServer()) {
@ -374,7 +398,7 @@ public function isProxyShouldRun()
    }
    public function isFunctional()
    {
-        return $this->settings->is_reachable && $this->settings->is_usable;
+        return $this->settings->is_reachable && $this->settings->is_usable && !$this->settings->force_disabled;
    }
    public function isLogDrainEnabled()
    {
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@ -48,7 +48,22 @@ public function getRecepients($notification)
        }
        return explode(',', $recipients);
    }
-
+    static public function serverLimitReached() {
+        $serverLimit = Team::serverLimit();
+        $team = currentTeam();
+        $servers = $team->servers->count();
+        return $servers >= $serverLimit;
+    }
+    public function serverOverflow() {
+        if ($this->serverLimit() < $this->servers->count()) {
+            return true;
+        }
+        return false;
+    }
+    static public function serverLimit()
+    {
+        return Team::find(currentTeam()->id)->limits['serverLimit'];
+    }
    public function limits(): Attribute
    {
        return Attribute::make(
@ -63,14 +78,19 @@ public function limits(): Attribute
                        $subscription = $subscription->type();
                    }
                }
-                $serverLimit = config('constants.limits.server')[strtolower($subscription)];
+                if ($this->custom_server_limit) {
+                    $serverLimit = $this->custom_server_limit;
+                } else {
+                    $serverLimit = config('constants.limits.server')[strtolower($subscription)];
+                }
                $sharedEmailEnabled = config('constants.limits.email')[strtolower($subscription)];
                return ['serverLimit' => $serverLimit, 'sharedEmailEnabled' => $sharedEmailEnabled];
            }

        );
    }
-    public function environment_variables() {
+    public function environment_variables()
+    {
        return $this->hasMany(SharedEnvironmentVariable::class)->whereNull('project_id')->whereNull('environment_id');
    }
    public function members()
@ -130,7 +150,8 @@ public function s3s()
    {
        return $this->hasMany(S3Storage::class)->where('is_usable', true);
    }
-    public function trialEnded() {
+    public function trialEnded()
+    {
        foreach ($this->servers as $server) {
            $server->settings()->update([
                'is_usable' => false,
@ -138,7 +159,8 @@ public function trialEnded() {
            ]);
        }
    }
-    public function trialEndedButSubscribed() {
+    public function trialEndedButSubscribed()
+    {
        foreach ($this->servers as $server) {
            $server->settings()->update([
                'is_usable' => true,
--- a/app/Notifications/Server/ForceDisabled.php
+++ b/app/Notifications/Server/ForceDisabled.php
@ -0,0 +1,63 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ForceDisabled extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Server ({$this->server->name}) disabled because it is not paid!");
+        $mail->view('emails.server-force-disabled', [
+            'name' => $this->server->name,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions).";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions)."
+        ];
+    }
+}
--- a/app/Notifications/Server/ForceEnabled.php
+++ b/app/Notifications/Server/ForceEnabled.php
@ -0,0 +1,63 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ForceEnabled extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Server ({$this->server->name}) enabled again!");
+        $mail->view('emails.server-force-enabled', [
+            'name' => $this->server->name,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server ({$this->server->name}) enabled again!";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server ({$this->server->name}) enabled again!"
+        ];
+    }
+}
--- a/app/Traits/ExecuteRemoteCommand.php
+++ b/app/Traits/ExecuteRemoteCommand.php
@ -24,6 +24,12 @@ public function execute_remote_command(...$commands)
        if ($this->server instanceof Server === false) {
            throw new \RuntimeException('Server is not set or is not an instance of Server model');
        }
+        if ($this->server->settings->force_disabled) {
+            $this->application_deployment_queue->update([
+                'status' => ApplicationDeploymentStatus::FAILED->value,
+            ]);
+            throw new \RuntimeException('Server is disabled');
+        }
        $commandsText->each(function ($single_command) {
            $command = data_get($single_command, 'command') ?? $single_command[0] ?? null;
            if ($command === null) {
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@ -423,7 +423,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
        '--security-opt',
        '--sysctl',
        '--ulimit',
-        '--device'
+        '--device',
    ]);
    $mapping = collect([
        '--cap-add' => 'cap_add',
@ -435,6 +435,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
        '--init' => 'init',
        '--ulimit' => 'ulimits',
        '--privileged' => 'privileged',
+        '--ip' => 'ip',
    ]);
    foreach ($matches as $match) {
        $option = $match[1];
--- a/config/sentry.php
+++ b/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.224',
+    'release' => '4.0.0-beta.225',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.224';
+return '4.0.0-beta.225';
--- a/database/migrations/2024_02_23_143119_add_custom_server_limits_to_teams_ultimate.php
+++ b/database/migrations/2024_02_23_143119_add_custom_server_limits_to_teams_ultimate.php
@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->integer('custom_server_limit')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('custom_server_limit');
+        });
+    }
+};
--- a/database/migrations/2024_02_25_222150_add_server_force_disabled_field.php
+++ b/database/migrations/2024_02_25_222150_add_server_force_disabled_field.php
@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->boolean('force_disabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('force_disabled');
+        });
+    }
+};
--- a/resources/views/components/banner.blade.php
+++ b/resources/views/components/banner.blade.php
@ -0,0 +1,22 @@
+@props(['closable' => true])
+<div x-data="{
+    bannerVisible: false,
+    bannerVisibleAfter: 100,
+}" x-show="bannerVisible" x-transition:enter="transition ease-out duration-200"
+    x-transition:enter-start="-translate-y-10" x-transition:enter-end="translate-y-0"
+    x-transition:leave="transition ease-in duration-100" x-transition:leave-start="translate-y-0"
+    x-transition:leave-end="-translate-y-10" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
+    class="relative z-50 w-full py-2 mx-auto duration-100 ease-out shadow-sm bg-coolgray-100 sm:py-0 sm:h-14" x-cloak>
+    <div class="flex items-center justify-between h-full px-3">
+        {{ $slot }}
+        @if ($closable)
+            <button @click="bannerVisible=false"
+                class="flex items-center flex-shrink-0 translate-x-1 ease-out duration-150 justify-center w-6 h-6 p-1.5 text-neutral-200 rounded-full hover:bg-coolgray-500">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor" class="w-full h-full">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                </svg>
+            </button>
+        @endif
+    </div>
+</div>
--- a/resources/views/components/limit-reached.blade.php
+++ b/resources/views/components/limit-reached.blade.php
@ -1,6 +1,6 @@
 <div class="flex flex-col items-center justify-center h-screen">
    <span class="text-xl font-bold text-white">You have reached the limit of {{ $name }} you can create.</span>
-    <span>Please <a class="text-white underline "href="{{ route('team.index') }}">upgrade your
+    <span>Please <a class="text-white underline "href="{{ route('subscription.show') }}">upgrade your
            subscription</a> to create more
        {{ $name }}.</span>
 </div>
--- a/resources/views/components/pricing-plans.blade.php
+++ b/resources/views/components/pricing-plans.blade.php
@ -188,21 +188,21 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
                </div>
                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
                    <h3 id="tier-ultimate" class="text-base font-semibold leading-7 text-white">Ultimate</h3>
-                    <p class="flex items-baseline mt-6 gap-x-1">
+                   <p class="flex items-baseline mt-6 gap-x-1">
                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">Custom</span>
+                            {{-- <span class="text-sm font-semibold leading-6 ">pay-as-you-go</span> --}}
                        </span>
                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">Custom</span>
+                            {{-- <span class="text-sm font-semibold leading-6 ">/month + VAT</span> --}}
                        </span>
                    </p>
-                    <span x-show="selected === 'monthly'" x-cloak>
-                        <span>billed monthly</span>
+                     <span x-show="selected === 'monthly'" x-cloak>
+                        <span>pay-as-you-go</span>
                    </span>
                    <span x-show="selected === 'yearly'" x-cloak>
-                        <span>billed annually</span>
+                        <span>pay-as-you-go</span>
                    </span>
                    @if ($showSubscribeButtons)
                        @isset($ultimate)
@ -219,7 +219,7 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                    clip-rule="evenodd" />
                            </svg>
-                            Connect <span class="px-1 font-bold text-white">unlimited</span> servers
+                            Connect <span class="px-1 font-bold text-white">10+</span> servers
                        </li>

                        <li class="flex gap-x-3">
--- a/resources/views/components/server/sidebar.blade.php
+++ b/resources/views/components/server/sidebar.blade.php
@ -1,24 +1,18 @@
-<div>
-    @if ($server->isFunctional())
-        <div class="flex h-full pr-4">
-            <div class="flex flex-col w-48 gap-4 min-w-fit">
-                <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
-                    href="{{ route('server.proxy', $parameters) }}">
-                    <button>Configuration</button>
-                </a>
-                @if (data_get($server, 'proxy.type') !== 'NONE')
-                    <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'text-white' : '' }}"
-                        href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
-                        <button>Dynamic Configurations</button>
-                    </a>
-                    <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
-                        href="{{ route('server.proxy.logs', $parameters) }}">
-                        <button>Logs</button>
-                    </a>
-                @endif
-            </div>
-        </div>
-    @else
-        <div>Server is not validated. Validate first.</div>
-    @endif
+<div class="flex h-full pr-4">
+    <div class="flex flex-col w-48 gap-4 min-w-fit">
+        <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
+            href="{{ route('server.proxy', $parameters) }}">
+            <button>Configuration</button>
+        </a>
+        @if (data_get($server, 'proxy.type') !== 'NONE')
+            <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'text-white' : '' }}"
+                href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
+                <button>Dynamic Configurations</button>
+            </a>
+            <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
+                href="{{ route('server.proxy.logs', $parameters) }}">
+                <button>Logs</button>
+            </a>
+        @endif
+    </div>
 </div>
--- a/resources/views/emails/server-force-disabled.blade.php
+++ b/resources/views/emails/server-force-disabled.blade.php
@ -0,0 +1,5 @@
+<x-emails.layout>
+Your server ({{ $name }}) disabled because it is not paid! All automations and integrations are stopped.
+
+Please update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions).
+</x-emails.layout>
--- a/resources/views/emails/server-force-enabled.blade.php
+++ b/resources/views/emails/server-force-enabled.blade.php
@ -0,0 +1,3 @@
+<x-emails.layout>
+Your server ({{ $name }}) is enabled again!
+</x-emails.layout>
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@ -7,7 +7,7 @@
            <magic-bar></magic-bar>
        </div>
    @endpersist
-    <livewire:sponsorship />
+    <livewire:layout-popups />
    @auth
        <livewire:realtime-connection />
    @endauth
--- a/resources/views/livewire/layout-popups.blade.php
+++ b/resources/views/livewire/layout-popups.blade.php
@ -11,4 +11,13 @@ class="underline text-warning">Please
            </div>
        </div>
    @endif
+    @if (currentTeam()->serverOverflow())
+        <x-banner :closable=false>
+            <div><span class="font-bold text-red-500">WARNING:</span> The number of active servers exceeds the limit
+                covered by your payment. If not resolved, some of your servers <span class="font-bold text-red-500">will
+                    be deactivated</span>. Visit <a href="{{ route('subscription.show') }}"
+                    class="text-white underline">/subscription</a> to update your subscription or remove some servers.
+            </div>
+        </x-banner>
+    @endif
 </div>
--- a/resources/views/livewire/project/application/deployment/show.blade.php
+++ b/resources/views/livewire/project/application/deployment/show.blade.php
@ -52,8 +52,8 @@ class="fixed top-4 right-16" x-on:click="toggleScroll"><svg class="icon" viewBox
                        @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                            <div @class([
                                'font-mono',
-                                'text-warning' => $line['hidden'],
-                                'text-red-500' => $line['type'] == 'stderr',
+                                'text-warning whitespace-pre-line' => $line['hidden'],
+                                'text-red-500 whitespace-pre-line' => $line['type'] == 'stderr',
                            ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
                                    <br>COMMAND: <br>{{ $line['command'] }} <br><br>OUTPUT:
                                    @endif @if (str($line['output'])->contains('http://') || str($line['output'])->contains('https://'))
--- a/resources/views/livewire/server/delete.blade.php
+++ b/resources/views/livewire/server/delete.blade.php
@ -7,10 +7,10 @@
            back!
        </div>
        @if ($server->definedResources()->count() > 0)
+            <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
            <x-new-modal disabled isErrorButton buttonTitle="Delete">
                This server will be deleted. It is not reversible. <br>Please think again.
            </x-new-modal>
-            <div>You need to delete all resources before deleting this server.</div>
        @else
            <x-new-modal isErrorButton buttonTitle="Delete">
                This server will be deleted. It is not reversible. <br>Please think again.
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@ -47,6 +47,10 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                Validate Server
            </x-forms.button>
        @endif
+        @if ($server->isForceDisabled() && isCloud())
+            <div class="pt-4 font-bold text-red-500">The system has disabled the server because you have exceeded the
+                number of servers for which you have paid.</div>
+        @endif
        <div class="flex flex-col gap-2 pt-4">
            <div class="flex flex-col w-full gap-2 lg:flex-row">
                <x-forms.input id="server.name" label="Name" required />
--- a/resources/views/livewire/server/index.blade.php
+++ b/resources/views/livewire/server/index.blade.php
@ -1,18 +1,18 @@
 <div>
    <div class="flex items-start gap-2">
        <h1>Servers</h1>
-        <a  class="text-white hover:no-underline" href="{{ route('server.create') }}">
+        <a class="text-white hover:no-underline" href="{{ route('server.create') }}">
            <x-forms.button class="btn">+ Add</x-forms.button>
        </a>
    </div>
    <div class="subtitle ">All Servers</div>
    <div class="grid gap-2 lg:grid-cols-2">
        @forelse ($servers as $server)
-            <a  href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
+            <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
                @class([
                    'gap-2 border cursor-pointer box group',
-                    'border-transparent' => $server->settings->is_reachable,
-                    'border-red-500' => !$server->settings->is_reachable,
+                    'border-transparent' => $server->settings->is_reachable && $server->settings->is_usable && !$server->settings->force_disabled,
+                    'border-red-500' => !$server->settings->is_reachable || $server->settings->force_disabled,
                ])>
                <div class="flex flex-col mx-6">
                    <div class="font-bold text-white">
@ -30,6 +30,9 @@
                        @if (!$server->settings->is_usable)
                            <span>Not usable by Coolify</span>
                        @endif
+                        @if ($server->settings->force_disabled)
+                            <span>Disabled by the system</span>
+                        @endif
                    </div>
                </div>
                <div class="flex-1"></div>
--- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
+++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
@ -1,7 +1,7 @@
 <div>
    <x-server.navbar :server="$server" :parameters="$parameters" />
+    <x-server.sidebar :server="$server" :parameters="$parameters" />
    <div class="flex gap-2">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
        <div class="w-full">
            @if ($server->isFunctional())
                <div class="flex gap-2">
@ -48,7 +48,6 @@ class="font-normal text-white normal-case border-none rounded btn btn-primary bt
                        <div wire:loading.remove> No dynamic configurations found.</div>
                    @endif
                </div>
-
            @endif
        </div>
    </div>
--- a/resources/views/livewire/server/proxy/show.blade.php
+++ b/resources/views/livewire/server/proxy/show.blade.php
@ -1,11 +1,13 @@
 <div>
    <x-server.navbar :server="$server" :parameters="$parameters" />
-    <div class="flex gap-2">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
-        <div class="w-full">
-            @if ($server->isFunctional())
+    @if ($server->isFunctional())
+        <div class="flex gap-2">
+            <x-server.sidebar :server="$server" :parameters="$parameters" />
+            <div class="w-full">
                <livewire:server.proxy :server="$server" />
-            @endif
+            </div>
        </div>
-    </div>
+        @else
+        <div>Server is not validated. Validate first.</div>
+    @endif
 </div>
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@ -1,7 +1,8 @@
 <div>
    @if (subscriptionProvider() === 'stripe')
        <div class="pt-4">
-            <div class="pb-4">Your current Plan is: <strong
+            <h2>Your current plan</h2>
+            <div class="pb-4">Tier: <strong
                    class="text-warning">{{ data_get(currentTeam(), 'subscription')->type() }}</strong></div>

            @if (currentTeam()->subscription->stripe_cancel_at_period_end)
@ -10,13 +11,19 @@ class="text-warning">{{ data_get(currentTeam(), 'subscription')->type() }}</stro
                <div>Subscription is active. Last invoice is
                    {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}.</div>
            @endif
-            <h3 class="pt-4">Limits</h3>
-            <div>Server: {{ $server_limits }}</div>
-            <h3 class="pt-4">Actions</h3>
+            <div>Number of paid servers: {{ $server_limits }}</div>
+            <div>Currently active servers: {{ currentTeam()->servers->count() }}</div>
+            @if (currentTeam()->serverOverflow())
+                <div class="py-4"><span class="font-bold text-red-500">WARNING:</span> You must delete
+                    {{ currentTeam()->servers->count() - $server_limits }} servers,
+                    or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be
+                    deactivated.</div>
+            @endif
+            <h2 class="pt-4">Manage your subscription</h2>
            <div class="pb-4">Cancel, upgrade or downgrade your subscription.</div>
            <div class="flex gap-2">
-                <x-forms.button wire:click='stripeCustomerPortal'>Manage your subscription on <svg
-                        xmlns="http://www.w3.org/2000/svg" class="w-12" viewBox="0 0 512 214">
+                <x-forms.button wire:click='stripeCustomerPortal'>Go to <svg xmlns="http://www.w3.org/2000/svg"
+                        class="w-12" viewBox="0 0 512 214">
                        <path fill="#635BFF"
                            d="M512 110.08c0-36.409-17.636-65.138-51.342-65.138c-33.85 0-54.33 28.73-54.33 64.854c0 42.808 24.179 64.426 58.88 64.426c16.925 0 29.725-3.84 39.396-9.244v-28.445c-9.67 4.836-20.764 7.823-34.844 7.823c-13.796 0-26.027-4.836-27.591-21.618h69.547c0-1.85.284-9.245.284-12.658Zm-70.258-13.511c0-16.071 9.814-22.756 18.774-22.756c8.675 0 17.92 6.685 17.92 22.756h-36.694Zm-90.31-51.627c-13.939 0-22.899 6.542-27.876 11.094l-1.85-8.818h-31.288v165.83l35.555-7.537l.143-40.249c5.12 3.698 12.657 8.96 25.173 8.96c25.458 0 48.64-20.48 48.64-65.564c-.142-41.245-23.609-63.716-48.498-63.716Zm-8.534 97.991c-8.391 0-13.37-2.986-16.782-6.684l-.143-52.765c3.698-4.124 8.818-6.968 16.925-6.968c12.942 0 21.902 14.506 21.902 33.137c0 19.058-8.818 33.28-21.902 33.28ZM241.493 36.551l35.698-7.68V0l-35.698 7.538V36.55Zm0 10.809h35.698v124.444h-35.698V47.36Zm-38.257 10.524L200.96 47.36h-30.72v124.444h35.556V87.467c8.39-10.951 22.613-8.96 27.022-7.396V47.36c-4.551-1.707-21.191-4.836-29.582 10.524Zm-71.112-41.386l-34.702 7.395l-.142 113.92c0 21.05 15.787 36.551 36.836 36.551c11.662 0 20.195-2.133 24.888-4.693V140.8c-4.55 1.849-27.022 8.391-27.022-12.658V77.653h27.022V47.36h-27.022l.142-30.862ZM35.982 83.484c0-5.546 4.551-7.68 12.09-7.68c10.808 0 24.461 3.272 35.27 9.103V51.484c-11.804-4.693-23.466-6.542-35.27-6.542C19.2 44.942 0 60.018 0 85.192c0 39.252 54.044 32.995 54.044 49.92c0 6.541-5.688 8.675-13.653 8.675c-11.804 0-26.88-4.836-38.827-11.378v33.849c13.227 5.689 26.596 8.106 38.827 8.106c29.582 0 49.92-14.648 49.92-40.106c-.142-42.382-54.329-34.845-54.329-50.774Z" />
                    </svg></x-forms.button>
--- a/resources/views/livewire/subscription/pricing-plans.blade.php
+++ b/resources/views/livewire/subscription/pricing-plans.blade.php
@ -22,16 +22,13 @@
            </x-forms.button>
        </x-slot:pro>
        <x-slot:ultimate>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
-                    target="_blank">
-                    Contact Us</a>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
            </x-forms.button>

-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
-                    target="_blank">
-                    Contact Us</a>
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
            </x-forms.button>
        </x-slot:ultimate>
    @endif
--- a/routes/api.php
+++ b/routes/api.php
@ -1,8 +1,8 @@
 <?php

-use App\Http\Controllers\Api\Deploy;
-use App\Http\Controllers\Api\Project;
-use App\Http\Controllers\Api\Server;
+use App\Http\Controllers\Api\APIDeploy as Deploy;
+use App\Http\Controllers\Api\APIProject as Project;
+use App\Http\Controllers\Api\APIServer as Server;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
--- a/routes/web.php
+++ b/routes/web.php
@ -1,6 +1,5 @@
 <?php

-use App\Http\Controllers\Api\Server as ApiServer;
 use App\Models\GitlabApp;
 use App\Models\PrivateKey;
 use App\Models\Server;
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@ -3,6 +3,7 @@
 use App\Enums\ProcessStatus;
 use App\Jobs\ApplicationPullRequestUpdateJob;
 use App\Jobs\GithubAppPermissionJob;
+use App\Jobs\ServerLimitCheckJob;
 use App\Jobs\SubscriptionInvoiceFailedJob;
 use App\Jobs\SubscriptionTrialEndedJob;
 use App\Jobs\SubscriptionTrialEndsSoonJob;
@ -875,6 +876,15 @@
                $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
                $feedback = data_get($data, 'cancellation_details.feedback');
                $comment = data_get($data, 'cancellation_details.comment');
+                $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                if (str($lookup_key)->contains('ultimate')) {
+                    $quantity = data_get($data, 'items.data.0.quantity', 10);
+                    $team = data_get($subscription, 'team');
+                    $team->update([
+                        'custom_server_limit' => $quantity,
+                    ]);
+                    ServerLimitCheckJob::dispatch($team);
+                }
                $subscription->update([
                    'stripe_feedback' => $feedback,
                    'stripe_comment' => $comment,
--- a/templates/compose/firefly.yaml
+++ b/templates/compose/firefly.yaml
@ -16,6 +16,7 @@ services:
      - DB_USERNAME=$SERVICE_USER_MYSQL
      - DB_PASSWORD=$SERVICE_PASSWORD_MYSQL
      - STATIC_CRON_TOKEN=$SERVICE_BASE64_CRONTOKEN
+      - TRUSTED_PROXIES=*
    volumes:
      - firefly-upload:/var/www/html/storage/upload
    healthcheck:
@ -49,8 +50,20 @@ services:
      retries: 10
    volumes:
      - firefly-mysql-data:/var/lib/mysql
-  # cron:
-  #   image: alpine
-  #   command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/$STATIC_CRON_TOKEN\" | crontab - && crond -f -L /dev/stdout"
-  #   environment:
-  #   - STATIC_CRON_TOKEN=$SERVICE_PASSWORD_32_CRONTOKEN
+  cron:
+    image: alpine
+    entrypoint: ["/entrypoint.sh"]
+    volumes:
+      - type: bind
+        source: ./entrypoint.sh
+        target: /entrypoint.sh
+        content: |
+          #!/bin/sh
+          # Substitute the environment variable into the cron command
+          CRON_COMMAND="0 3 * * * wget -qO- http://firefly:8080/api/v1/cron/${STATIC_CRON_TOKEN}"
+          # Add the cron command to the crontab
+          echo "$CRON_COMMAND" | crontab -
+          # Start the cron daemon in the foreground with logging to stdout
+          crond -f -L /dev/stdout
+    environment:
+      - STATIC_CRON_TOKEN=$SERVICE_BASE64_CRONTOKEN
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@ -195,7 +195,7 @@
    "firefly": {
        "documentation": "https:\/\/firefly-iii.org",
        "slogan": "A personal finances manager that can help you save money.",
-        "compose": "c2VydmljZXM6CiAgZmlyZWZseToKICAgIGltYWdlOiAnZmlyZWZseWlpaS9jb3JlOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSVJFRkxZCiAgICAgIC0gQVBQX0tFWT0kU0VSVklDRV9CQVNFNjRfQVBQS0VZCiAgICAgIC0gREJfSE9TVD1teXNxbAogICAgICAtIERCX1BPUlQ9MzMwNgogICAgICAtIERCX0NPTk5FQ1RJT049bXlzcWwKICAgICAgLSAnREJfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gREJfVVNFUk5BTUU9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIERCX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gU1RBVElDX0NST05fVE9LRU49JFNFUlZJQ0VfQkFTRTY0X0NST05UT0tFTgogICAgdm9sdW1lczoKICAgICAgLSAnZmlyZWZseS11cGxvYWQ6L3Zhci93d3cvaHRtbC9zdG9yYWdlL3VwbG9hZCcKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo4MDgwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICBkZXBlbmRzX29uOgogICAgICBteXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIG15c3FsOgogICAgaW1hZ2U6ICdtYXJpYWRiOmx0cycKICAgIGVudmlyb25tZW50OgogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgLSAnTVlTUUxfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMfScKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbXlzcWxhZG1pbgogICAgICAgIC0gcGluZwogICAgICAgIC0gJy1oJwogICAgICAgIC0gbG9jYWxob3N0CiAgICAgICAgLSAnLXVyb290JwogICAgICAgIC0gJy1wJHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2ZpcmVmbHktbXlzcWwtZGF0YTovdmFyL2xpYi9teXNxbCcK",
+        "compose": "c2VydmljZXM6CiAgZmlyZWZseToKICAgIGltYWdlOiAnZmlyZWZseWlpaS9jb3JlOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSVJFRkxZCiAgICAgIC0gQVBQX0tFWT0kU0VSVklDRV9CQVNFNjRfQVBQS0VZCiAgICAgIC0gREJfSE9TVD1teXNxbAogICAgICAtIERCX1BPUlQ9MzMwNgogICAgICAtIERCX0NPTk5FQ1RJT049bXlzcWwKICAgICAgLSAnREJfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gREJfVVNFUk5BTUU9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIERCX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gU1RBVElDX0NST05fVE9LRU49JFNFUlZJQ0VfQkFTRTY0X0NST05UT0tFTgogICAgICAtICdUUlVTVEVEX1BST1hJRVM9KicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2ZpcmVmbHktdXBsb2FkOi92YXIvd3d3L2h0bWwvc3RvcmFnZS91cGxvYWQnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgbXlzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBteXNxbDoKICAgIGltYWdlOiAnbWFyaWFkYjpsdHMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LWZpcmVmbHl9JwogICAgICAtICdNWVNRTF9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIGxvY2FsaG9zdAogICAgICAgIC0gJy11cm9vdCcKICAgICAgICAtICctcCR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICB2b2x1bWVzOgogICAgICAtICdmaXJlZmx5LW15c3FsLWRhdGE6L3Zhci9saWIvbXlzcWwnCiAgY3JvbjoKICAgIGltYWdlOiBhbHBpbmUKICAgIGVudHJ5cG9pbnQ6CiAgICAgIC0gL2VudHJ5cG9pbnQuc2gKICAgIHZvbHVtZXM6CiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2VudHJ5cG9pbnQuc2gKICAgICAgICB0YXJnZXQ6IC9lbnRyeXBvaW50LnNoCiAgICAgICAgY29udGVudDogIiMhL2Jpbi9zaFxuIyBTdWJzdGl0dXRlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBpbnRvIHRoZSBjcm9uIGNvbW1hbmRcbkNST05fQ09NTUFORD1cIjAgMyAqICogKiB3Z2V0IC1xTy0gaHR0cDovL2ZpcmVmbHk6ODA4MC9hcGkvdjEvY3Jvbi8ke1NUQVRJQ19DUk9OX1RPS0VOfVwiXG4jIEFkZCB0aGUgY3JvbiBjb21tYW5kIHRvIHRoZSBjcm9udGFiXG5lY2hvIFwiJENST05fQ09NTUFORFwiIHwgY3JvbnRhYiAtXG4jIFN0YXJ0IHRoZSBjcm9uIGRhZW1vbiBpbiB0aGUgZm9yZWdyb3VuZCB3aXRoIGxvZ2dpbmcgdG8gc3Rkb3V0XG5jcm9uZCAtZiAtTCAvZGV2L3N0ZG91dCIKICAgIGVudmlyb25tZW50OgogICAgICAtIFNUQVRJQ19DUk9OX1RPS0VOPSRTRVJWSUNFX0JBU0U2NF9DUk9OVE9LRU4K",
        "tags": [
            "finance",
            "money",
--- a/tests/Feature/DockerRunTest.php
+++ b/tests/Feature/DockerRunTest.php
@ -8,6 +8,15 @@
    ])->ray();
 });

+test('ConvertIp', function () {
+    $input = '--cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add SYS_ADMIN --ip 127.0.0.1 --ip 127.0.0.2';
+    $output = convert_docker_run_to_compose($input);
+    expect($output)->toBe([
+        'cap_add' => ['NET_ADMIN', 'NET_RAW', 'SYS_ADMIN'],
+        'ip' => ['127.0.0.1', '127.0.0.2']
+    ])->ray();
+});
+
 test('ConvertPrivilegedAndInit', function () {
    $input = '---privileged --init';
    $output = convert_docker_run_to_compose($input);
--- a/versions.json
+++ b/versions.json
@ -4,7 +4,7 @@
            "version": "3.12.36"
        },
        "v4": {
-            "version": "4.0.0-beta.224"
+            "version": "4.0.0-beta.225"
        }
    }
 }