From 2475875f974d4ac9bdf1f51b94b5d8d183c64b85 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:59:11 +0100
Subject: [PATCH 01/15] fix mino and logto

---
 bootstrap/helpers/docker.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 302193131..da99c5cbd 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -227,13 +227,17 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
             $MINIO_BROWSER_REDIRECT_URL = $variables->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
             $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first();
 
-            if (str($MINIO_BROWSER_REDIRECT_URL->value)->isEmpty()) {
-                $MINIO_BROWSER_REDIRECT_URL?->update([
+            if (is_null($MINIO_BROWSER_REDIRECT_URL) || is_null($MINIO_SERVER_URL)) {
+                return collect([]);
+            }
+
+            if (str($MINIO_BROWSER_REDIRECT_URL->value ?? '')->isEmpty()) {
+                $MINIO_BROWSER_REDIRECT_URL->update([
                     'value' => generateFqdn($server, 'console-'.$uuid, true),
                 ]);
             }
-            if (str($MINIO_SERVER_URL->value)->isEmpty()) {
-                $MINIO_SERVER_URL?->update([
+            if (str($MINIO_SERVER_URL->value ?? '')->isEmpty()) {
+                $MINIO_SERVER_URL->update([
                     'value' => generateFqdn($server, 'minio-'.$uuid, true),
                 ]);
             }
@@ -246,13 +250,17 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
             $LOGTO_ENDPOINT = $variables->where('key', 'LOGTO_ENDPOINT')->first();
             $LOGTO_ADMIN_ENDPOINT = $variables->where('key', 'LOGTO_ADMIN_ENDPOINT')->first();
 
-            if (str($LOGTO_ENDPOINT?->value)->isEmpty()) {
-                $LOGTO_ENDPOINT?->update([
+            if (is_null($LOGTO_ENDPOINT) || is_null($LOGTO_ADMIN_ENDPOINT)) {
+                return collect([]);
+            }
+
+            if (str($LOGTO_ENDPOINT->value ?? '')->isEmpty()) {
+                $LOGTO_ENDPOINT->update([
                     'value' => generateFqdn($server, 'logto-'.$uuid),
                 ]);
             }
-            if (str($LOGTO_ADMIN_ENDPOINT?->value)->isEmpty()) {
-                $LOGTO_ADMIN_ENDPOINT?->update([
+            if (str($LOGTO_ADMIN_ENDPOINT->value ?? '')->isEmpty()) {
+                $LOGTO_ADMIN_ENDPOINT->update([
                     'value' => generateFqdn($server, 'logto-admin-'.$uuid),
                 ]);
             }

From 94e8ee4a991436cc16c2b0b18fea81ad2046063f Mon Sep 17 00:00:00 2001
From: Luan Estradioto <luanestradioto@gmail.com>
Date: Fri, 15 Nov 2024 16:50:44 -0300
Subject: [PATCH 02/15] fix: modal (+ add) on dynamic config was not opening,
 removed x-cloak

---
 resources/views/components/modal-input.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/modal-input.blade.php b/resources/views/components/modal-input.blade.php
index f396f399d..6f04bc309 100644
--- a/resources/views/components/modal-input.blade.php
+++ b/resources/views/components/modal-input.blade.php
@@ -27,7 +27,7 @@
     @endif
     <template x-teleport="body">
         <div x-show="modalOpen"
-            class="fixed top-0 left-0 lg:px-0 px-4 z-[99] flex items-center justify-center w-screen h-screen" x-cloak>
+            class="fixed top-0 left-0 lg:px-0 px-4 z-[99] flex items-center justify-center w-screen h-screen">
             <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
                 x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0"

From 35659962241080e08df5538b0b931dec42a18e06 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:06:57 +0100
Subject: [PATCH 03/15] fix autoupdated hardcoded

---
 config/constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/constants.php b/config/constants.php
index 8a88c6c7a..364381cef 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -4,7 +4,7 @@ return [
     'coolify' => [
         'version' => '4.0.0-beta.369',
         'self_hosted' => env('SELF_HOSTED', true),
-        'autoupdate' => env('AUTOUPDATE', false),
+        'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
         'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper'),
         'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),

From 0eab7f78ff6f9ace56a2cccc399cff2979d0da49 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 15 Nov 2024 21:22:11 +0100
Subject: [PATCH 04/15] version++ and fix private key saving

---
 app/Models/PrivateKey.php | 7 +++----
 config/constants.php      | 2 +-
 config/version.php        | 2 +-
 versions.json             | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/Models/PrivateKey.php b/app/Models/PrivateKey.php
index fab1f1de7..80015d87f 100644
--- a/app/Models/PrivateKey.php
+++ b/app/Models/PrivateKey.php
@@ -219,15 +219,14 @@ class PrivateKey extends BaseModel
     private static function fingerprintExists($fingerprint, $excludeId = null)
     {
         $query = self::query()
-            ->where('fingerprint', $fingerprint);
+            ->where('fingerprint', $fingerprint)
+            ->where('id', '!=', $excludeId);
 
         if (currentTeam()) {
             $query->where('team_id', currentTeam()->id);
         }
 
-        return $query
-            ->when($excludeId, fn ($query) => $query->where('id', '!=', $excludeId))
-            ->exists();
+        return $query->exists();
     }
 
     public static function cleanupUnusedKeys()
diff --git a/config/constants.php b/config/constants.php
index 364381cef..363cdd14f 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.369',
+        'version' => '4.0.0-beta.370',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
diff --git a/config/version.php b/config/version.php
index 00330af8b..64226ac05 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.369';
+return '4.0.0-beta.370';
diff --git a/versions.json b/versions.json
index 3bca83c16..6c7bd3204 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.369"
+            "version": "4.0.0-beta.370"
         },
         "nightly": {
-            "version": "4.0.0-beta.370"
+            "version": "4.0.0-beta.371"
         },
         "helper": {
             "version": "1.0.4"
@@ -16,4 +16,4 @@
             "version": "0.0.15"
         }
     }
-}
+}
\ No newline at end of file

From b43d62f51b936b96d99bbe4c3551ef7bdbc284ad Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 15 Nov 2024 21:44:02 +0100
Subject: [PATCH 05/15] fix: AUTOUPDATE + checkbox opacity

---
 app/View/Components/Forms/Checkbox.php              |  4 +++-
 resources/views/components/forms/checkbox.blade.php | 12 ++++++++----
 resources/views/livewire/settings/index.blade.php   |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/View/Components/Forms/Checkbox.php b/app/View/Components/Forms/Checkbox.php
index 414dbf2ae..0569bb436 100644
--- a/app/View/Components/Forms/Checkbox.php
+++ b/app/View/Components/Forms/Checkbox.php
@@ -21,7 +21,9 @@ class Checkbox extends Component
         public bool $disabled = false,
         public string $defaultClass = 'dark:border-neutral-700 text-coolgray-400 focus:ring-warning dark:bg-coolgray-100 rounded cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed',
     ) {
-        //
+        if ($this->disabled) {
+            $this->defaultClass .= ' opacity-40';
+        }
     }
 
     /**
diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php
index ef4d5a7f3..fb244962d 100644
--- a/resources/views/components/forms/checkbox.blade.php
+++ b/resources/views/components/forms/checkbox.blade.php
@@ -5,6 +5,7 @@
     'disabled' => false,
     'instantSave' => false,
     'value' => null,
+    'checked' => false,
     'hideLabel' => false,
     'fullWidth' => false,
 ])
@@ -14,7 +15,9 @@
     'w-full' => $fullWidth,
 ])>
     @if (!$hideLabel)
-        <label @class(['flex gap-4 items-center px-0 min-w-fit label w-full cursor-pointer', 'opacity-40' => $disabled])>
+        <label @class([
+            'flex gap-4 items-center px-0 min-w-fit label w-full cursor-pointer',
+        ])>
             <span class="flex flex-grow gap-2">
                 @if ($label)
                     {!! $label !!}
@@ -26,9 +29,10 @@
                 @endif
             </span>
     @endif
-            <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
-                @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
-                wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
+    <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
+        @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
+        @if ($checked) checked @endif
+    wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
     @if (!$hideLabel)
         </label>
     @endif
diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php
index 3d399c93f..0361587d6 100644
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -103,7 +103,7 @@
             @if (!is_null(config('constants.coolify.autoupdate', null)))
                 <div class="text-right md:w-96">
                     <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there."
-                        disabled id="is_auto_update_enabled" label="Enabled" />
+                        disabled checked="{{ config('constants.coolify.autoupdate') }}" label="Enabled" />
                 </div>
             @else
                 <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Enabled" />

From 1fc4c7872e19275d73f1a83465d51661d51ef659 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 15 Nov 2024 21:47:31 +0100
Subject: [PATCH 06/15] fix

---
 app/View/Components/Forms/Checkbox.php            | 1 +
 resources/views/livewire/settings/index.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/View/Components/Forms/Checkbox.php b/app/View/Components/Forms/Checkbox.php
index 0569bb436..0bdebe7e4 100644
--- a/app/View/Components/Forms/Checkbox.php
+++ b/app/View/Components/Forms/Checkbox.php
@@ -17,6 +17,7 @@ class Checkbox extends Component
         public ?string $value = null,
         public ?string $label = null,
         public ?string $helper = null,
+        public string|bool|null $checked = false,
         public string|bool $instantSave = false,
         public bool $disabled = false,
         public string $defaultClass = 'dark:border-neutral-700 text-coolgray-400 focus:ring-warning dark:bg-coolgray-100 rounded cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed',
diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php
index 0361587d6..888f11ffc 100644
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -103,7 +103,7 @@
             @if (!is_null(config('constants.coolify.autoupdate', null)))
                 <div class="text-right md:w-96">
                     <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there."
-                        disabled checked="{{ config('constants.coolify.autoupdate') }}" label="Enabled" />
+                        disabled checked="{{ config('constants.coolify.autoupdate') }}" label="Auto Update Enabled" />
                 </div>
             @else
                 <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Enabled" />

From 0ac3505c06c00c8977b81417e4916657a5766cc2 Mon Sep 17 00:00:00 2001
From: truemiller <mlxndrj@gmail.com>
Date: Sat, 16 Nov 2024 09:03:42 +0000
Subject: [PATCH 07/15] fix: improve helper text for metrics input fields

---
 resources/views/livewire/server/show.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index dcad8ac37..9fe73a5a2 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -219,12 +219,12 @@
                                 <div class="flex flex-wrap gap-2 sm:flex-nowrap">
                                     <x-forms.input id="sentinelMetricsRefreshRateSeconds"
                                         label="Metrics rate (seconds)" required
-                                        helper="The interval for gathering metrics. Lower means more disk space will be used." />
+                                        helper="The interval for gathering metrics. Lower values result in more disk space usage." />
                                     <x-forms.input id="sentinelMetricsHistoryDays" label="Metrics history (days)"
-                                        required helper="How many days should the metrics data should be reserved." />
+                                        required helper="The number of days that metrics data should be retained for." />
                                     <x-forms.input id="sentinelPushIntervalSeconds" label="Push interval (seconds)"
                                         required
-                                        helper="How many seconds should the metrics data should be pushed to the collector." />
+                                        helper="The interval (in seconds) at which  metrics data is sent to the collector." />
                                 </div>
                             </div>
                         @endif

From d38110f3ef8492d7720f2c5170488db800a98262 Mon Sep 17 00:00:00 2001
From: truemiller <mlxndrj@gmail.com>
Date: Sat, 16 Nov 2024 09:04:11 +0000
Subject: [PATCH 08/15] fix: refine helper text for metrics input fields

---
 resources/views/livewire/server/show.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index 9fe73a5a2..5aed0b4e2 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -219,12 +219,12 @@
                                 <div class="flex flex-wrap gap-2 sm:flex-nowrap">
                                     <x-forms.input id="sentinelMetricsRefreshRateSeconds"
                                         label="Metrics rate (seconds)" required
-                                        helper="The interval for gathering metrics. Lower values result in more disk space usage." />
+                                        helper="Interval used for gathering metrics. Lower values result in more disk space usage." />
                                     <x-forms.input id="sentinelMetricsHistoryDays" label="Metrics history (days)"
-                                        required helper="The number of days that metrics data should be retained for." />
+                                        required helper="Number of days to retain metrics data for." />
                                     <x-forms.input id="sentinelPushIntervalSeconds" label="Push interval (seconds)"
                                         required
-                                        helper="The interval (in seconds) at which  metrics data is sent to the collector." />
+                                        helper="Interval at which metrics data is sent to the collector." />
                                 </div>
                             </div>
                         @endif

From 4fb26bd1acf8c493eb3b92f0df9a641f3b92beaf Mon Sep 17 00:00:00 2001
From: Darren Sisson <darrensisson@hotmail.com>
Date: Sat, 16 Nov 2024 11:15:14 +0000
Subject: [PATCH 09/15] fix appwrite to use prod env and service not dev

---
 templates/compose/appwrite.yaml | 89 +++++++--------------------------
 1 file changed, 19 insertions(+), 70 deletions(-)

diff --git a/templates/compose/appwrite.yaml b/templates/compose/appwrite.yaml
index 039d5b8ec..20d1f8f1f 100644
--- a/templates/compose/appwrite.yaml
+++ b/templates/compose/appwrite.yaml
@@ -47,7 +47,6 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_DB_ROOT_PASS=$SERVICE_PASSWORD_MARIADBROOT
       - _APP_SMTP_HOST=${_APP_SMTP_HOST}
       - _APP_SMTP_PORT=${_APP_SMTP_PORT}
       - _APP_SMTP_SECURE=${_APP_SMTP_SECURE}
@@ -88,7 +87,6 @@ services:
       - _APP_FUNCTIONS_RUNTIMES=${_APP_FUNCTIONS_RUNTIMES:-node-20.0,php-8.2,python-3.11,ruby-3.2}
       - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
       - _APP_EXECUTOR_HOST=${_APP_EXECUTOR_HOST:-http://appwrite-executor/v1}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_MAINTENANCE_INTERVAL=${_APP_MAINTENANCE_INTERVAL:-86400}
       - _APP_MAINTENANCE_DELAY=${_APP_MAINTENANCE_DELAY}
@@ -112,13 +110,6 @@ services:
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=${_APP_MIGRATIONS_FIREBASE_CLIENT_ID}
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=${_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET}
       - _APP_ASSISTANT_OPENAI_API_KEY=${_APP_ASSISTANT_OPENAI_API_KEY}
-      - _APP_MESSAGE_SMS_TEST_DSN=${_APP_MESSAGE_SMS_TEST_DSN}
-      - _APP_MESSAGE_EMAIL_TEST_DSN=${_APP_MESSAGE_EMAIL_TEST_DSN}
-      - _APP_MESSAGE_PUSH_TEST_DSN=${_APP_MESSAGE_PUSH_TEST_DSN}
-      - _APP_CONSOLE_COUNTRIES_DENYLIST=${_APP_CONSOLE_COUNTRIES_DENYLIST}
-      - _APP_EXPERIMENT_LOGGING_PROVIDER=${_APP_EXPERIMENT_LOGGING_PROVIDER}
-      - _APP_EXPERIMENT_LOGGING_CONFIG=${_APP_EXPERIMENT_LOGGING_CONFIG}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-console:
     image: appwrite/console:5.0.12
@@ -149,9 +140,7 @@ services:
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-audits:
     image: appwrite/appwrite:1.6.0
@@ -173,9 +162,7 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-webhooks:
     image: appwrite/appwrite:1.6.0
@@ -189,14 +176,17 @@ services:
       - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
       - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
       - _APP_EMAIL_SECURITY=${_APP_EMAIL_SECURITY:-certs@appwrite.io}
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=${_APP_SYSTEM_SECURITY_EMAIL_ADDRESS}
+      - _APP_DB_HOST=${_APP_DB_HOST:-appwrite-mariadb}
+      - _APP_DB_PORT=${_APP_DB_PORT:-3306}
+      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
+      - _APP_DB_USER=$SERVICE_USER_MARIADB
+      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
       - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
       - _APP_REDIS_USER=${_APP_REDIS_USER}
       - _APP_REDIS_PASS=${_APP_REDIS_PASS}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=${_APP_WEBHOOK_MAX_FAILED_ATTEMPTS:-3}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-deletes:
     image: appwrite/appwrite:1.6.0
@@ -245,11 +235,12 @@ services:
       - _APP_STORAGE_WASABI_SECRET=${_APP_STORAGE_WASABI_SECRET}
       - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
       - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
       - _APP_EXECUTOR_HOST=${_APP_EXECUTOR_HOST:-http://appwrite-executor/v1}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+      - _APP_MAINTENANCE_RETENTION_ABUSE=${_APP_MAINTENANCE_RETENTION_ABUSE:-86400}
+      - _APP_MAINTENANCE_RETENTION_AUDIT=${_APP_MAINTENANCE_RETENTION_AUDIT:-1209600}
+      - _APP_MAINTENANCE_RETENTION_EXECUTION=${_APP_MAINTENANCE_RETENTION_EXECUTION:-1209600}
 
   appwrite-worker-databases:
     image: appwrite/appwrite:1.6.0
@@ -271,11 +262,7 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_WORKERS_NUM=${_APP_WORKERS_NUM:-1}
-      - _APP_QUEUE_NAME=${_APP_QUEUE_NAME:-appwrite}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-builds:
     image: appwrite/appwrite:1.6.0
@@ -302,7 +289,6 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_VCS_GITHUB_APP_NAME=${_APP_VCS_GITHUB_APP_NAME}
       - _APP_VCS_GITHUB_PRIVATE_KEY=${_APP_VCS_GITHUB_PRIVATE_KEY}
@@ -311,7 +297,9 @@ services:
       - _APP_FUNCTIONS_BUILD_TIMEOUT=${_APP_FUNCTIONS_BUILD_TIMEOUT:-900}
       - _APP_FUNCTIONS_CPUS=${_APP_FUNCTIONS_CPUS:-0}
       - _APP_FUNCTIONS_MEMORY=${_APP_FUNCTIONS_MEMORY:-0}
+      - _APP_FUNCTIONS_SIZE_LIMIT=${_APP_FUNCTIONS_SIZE_LIMIT:-30000000}
       - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=${_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS:-disabled}
       - _APP_DOMAIN=$SERVICE_URL_APPWRITE
       - _APP_STORAGE_DEVICE=${_APP_STORAGE_DEVICE:-local}
       - _APP_STORAGE_S3_ACCESS_KEY=${_APP_STORAGE_S3_ACCESS_KEY:-local}
@@ -334,7 +322,6 @@ services:
       - _APP_STORAGE_WASABI_SECRET=${_APP_STORAGE_WASABI_SECRET}
       - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
       - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-certificates:
     image: appwrite/appwrite:1.6.0
@@ -364,9 +351,7 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-functions:
     image: appwrite/appwrite:1.6.0
@@ -400,10 +385,7 @@ services:
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
       - _APP_DOCKER_HUB_USERNAME=${_APP_DOCKER_HUB_USERNAME}
       - _APP_DOCKER_HUB_PASSWORD=${_APP_DOCKER_HUB_PASSWORD}
-      - _APP_DOCKER_HUB_EMAIL=${_APP_DOCKER_HUB_EMAIL}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-mails:
     image: appwrite/appwrite:1.6.0
@@ -417,6 +399,11 @@ services:
       - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
       - _APP_SYSTEM_EMAIL_NAME=${_APP_SYSTEM_EMAIL_NAME:-Appwrite}
       - _APP_SYSTEM_EMAIL_ADDRESS=${_APP_SYSTEM_EMAIL_ADDRESS:-team@appwrite.io}
+      - _APP_DB_HOST=${_APP_DB_HOST:-appwrite-mariadb}
+      - _APP_DB_PORT=${_APP_DB_PORT:-3306}
+      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
+      - _APP_DB_USER=$SERVICE_USER_MARIADB
+      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
       - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
       - _APP_REDIS_USER=${_APP_REDIS_USER}
@@ -426,11 +413,8 @@ services:
       - _APP_SMTP_SECURE=${_APP_SMTP_SECURE}
       - _APP_SMTP_USERNAME=${_APP_SMTP_USERNAME}
       - _APP_SMTP_PASSWORD=${_APP_SMTP_PASSWORD}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_DOMAIN=$SERVICE_URL_APPWRITE
-      - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-messaging:
     image: appwrite/appwrite:1.6.0
@@ -453,11 +437,9 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_SMS_FROM=${_APP_SMS_FROM}
       - _APP_SMS_PROVIDER=${_APP_SMS_PROVIDER}
-      - _APP_SMS_PROJECTS_DENY_LIST=${_APP_SMS_PROJECTS_DENY_LIST}
       - _APP_STORAGE_DEVICE=${_APP_STORAGE_DEVICE:-local}
       - _APP_STORAGE_S3_ACCESS_KEY=${_APP_STORAGE_S3_ACCESS_KEY}
       - _APP_STORAGE_S3_SECRET=${_APP_STORAGE_S3_SECRET}
@@ -479,7 +461,6 @@ services:
       - _APP_STORAGE_WASABI_SECRET=${_APP_STORAGE_WASABI_SECRET}
       - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
       - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-migrations:
     image: appwrite/appwrite:1.6.0
@@ -503,16 +484,14 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=${_APP_MIGRATIONS_FIREBASE_CLIENT_ID}
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=${_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
-  appwrite-maintenance:
+  appwrite-task-maintenance:
     image: appwrite/appwrite:1.6.0
     entrypoint: maintenance
-    container_name: appwrite-maintenance
+    container_name: appwrite-task-maintenance
     depends_on:
       - appwrite-redis
     environment:
@@ -538,8 +517,6 @@ services:
       - _APP_MAINTENANCE_RETENTION_AUDIT=${_APP_MAINTENANCE_RETENTION_AUDIT:-1209600}
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=${_APP_MAINTENANCE_RETENTION_USAGE_HOURLY:-8640000}
       - _APP_MAINTENANCE_RETENTION_SCHEDULES=${_APP_MAINTENANCE_RETENTION_SCHEDULES:-86400}
-      - _APP_MAINTENANCE_DELAY=${_APP_MAINTENANCE_DELAY}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-usage:
     image: appwrite/appwrite:1.6.0
@@ -563,10 +540,8 @@ services:
       - _APP_REDIS_USER=${_APP_REDIS_USER}
       - _APP_REDIS_PASS=${_APP_REDIS_PASS}
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_USAGE_AGGREGATION_INTERVAL=${_APP_USAGE_AGGREGATION_INTERVAL:-30}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-worker-usage-dump:
     image: appwrite/appwrite:1.6.0
@@ -589,10 +564,8 @@ services:
       - _APP_REDIS_USER=${_APP_REDIS_USER}
       - _APP_REDIS_PASS=${_APP_REDIS_PASS}
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
-      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_USAGE_AGGREGATION_INTERVAL=${_APP_USAGE_AGGREGATION_INTERVAL:-30}
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-task-scheduler-functions:
     image: appwrite/appwrite:1.6.0
@@ -614,7 +587,6 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-task-scheduler-executions:
     image: appwrite/appwrite:1.6.0
@@ -636,7 +608,6 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-task-scheduler-messages:
     image: appwrite/appwrite:1.6.0
@@ -658,13 +629,12 @@ services:
       - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
 
   appwrite-assistant:
     image: appwrite/assistant:0.4.0
     container_name: appwrite-assistant
     environment:
-      - _APP_ASSISTANT_OPENAI_API_KEY
+      - _APP_ASSISTANT_OPENAI_API_KEY=${_APP_ASSISTANT_OPENAI_API_KEY}
 
   openruntimes-executor:
     container_name: openruntimes-executor
@@ -687,8 +657,6 @@ services:
       - OPR_EXECUTOR_ENV=${_APP_ENV:-production}
       - OPR_EXECUTOR_RUNTIMES=${_APP_FUNCTIONS_RUNTIMES}
       - OPR_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
-      - OPR_EXECUTOR_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - OPR_EXECUTOR_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - OPR_EXECUTOR_STORAGE_DEVICE=${_APP_STORAGE_DEVICE:-local}
       - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=${_APP_STORAGE_S3_ACCESS_KEY:-local}
@@ -712,25 +680,6 @@ services:
       - OPR_EXECUTOR_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION}
       - OPR_EXECUTOR_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
 
-  openruntimes-proxy:
-    container_name: openruntimes-proxy
-    hostname: proxy
-    stop_signal: SIGINT
-    image: openruntimes/proxy:0.5.5
-    networks:
-      - runtimes
-    environment:
-      - OPR_PROXY_WORKER_PER_CORE=${OPR_PROXY_WORKER_PER_CORE:-1}
-      - OPR_PROXY_ENV=${_APP_ENV:-production}
-      - OPR_PROXY_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
-      - OPR_PROXY_SECRET=$SERVICE_PASSWORD_64_APPWRITE
-      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
-      - OPR_PROXY_ALGORITHM=random
-      - OPR_PROXY_EXECUTORS=exc1
-      - OPR_PROXY_HEALTHCHECK_INTERVAL=10000
-      - OPR_PROXY_MAX_TIMEOUT=600
-      - OPR_PROXY_HEALTHCHECK=enabled
-
   appwrite-mariadb:
     image: mariadb:10.11
     container_name: appwrite-mariadb

From d1604eacd31d30e561c8c8d20b60b5c7866a8930 Mon Sep 17 00:00:00 2001
From: David R <david@petersmark.com>
Date: Sun, 17 Nov 2024 10:29:26 -0500
Subject: [PATCH 10/15] Add important env variables

OPENAI_API_KEY is necessary for AI tagging, and DISABLE_SIGNUPS is very commonly needed.
---
 templates/compose/hoarder.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/compose/hoarder.yaml b/templates/compose/hoarder.yaml
index 89002d759..4ce1c433f 100644
--- a/templates/compose/hoarder.yaml
+++ b/templates/compose/hoarder.yaml
@@ -16,6 +16,8 @@ services:
       - NEXTAUTH_URL=${SERVICE_FQDN_HOARDER}
       - MEILI_ADDR=http://meilisearch:7700
       - BROWSER_WEB_URL=http://chrome:9222
+      - OPENAI_API_KEY=${SERVICE_OPENAI_API_KEY}
+      - DISABLE_SIGNUPS=${SERVICE_DISABLE_SIGNUPS}
       - DATA_DIR=/data
 
   chrome:
@@ -41,4 +43,4 @@ services:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:7700/health"]
       interval: 2s
       timeout: 10s
-      retries: 15
\ No newline at end of file
+      retries: 15

From 288068f2e9466f632d8a9fc437414ce865ce6b53 Mon Sep 17 00:00:00 2001
From: wina <93845486+httpsWina@users.noreply.github.com>
Date: Mon, 18 Nov 2024 00:54:34 -0300
Subject: [PATCH 11/15] Update embystat.yaml

its embystat, not emnystat
---
 templates/compose/embystat.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/embystat.yaml b/templates/compose/embystat.yaml
index 75d3484ed..e86052c1e 100644
--- a/templates/compose/embystat.yaml
+++ b/templates/compose/embystat.yaml
@@ -1,5 +1,5 @@
 # documentation: https://github.com/mregni/EmbyStat
-# slogan: EmnyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.
+# slogan: EmbyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.
 # tags: media, server, movies, tv, music
 # port: 6555
 

From 0409e87a8765f1f4311aec89a4d79d30d5ba9a81 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 20 Nov 2024 17:57:10 +0100
Subject: [PATCH 12/15] version++

---
 config/constants.php | 2 +-
 config/version.php   | 2 +-
 versions.json        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index 363cdd14f..dcd49b177 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.370',
+        'version' => '4.0.0-beta.371',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
diff --git a/config/version.php b/config/version.php
index 64226ac05..fcda1b4ac 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.370';
+return '4.0.0-beta.371';
diff --git a/versions.json b/versions.json
index 6c7bd3204..7bffcd1ff 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.370"
+            "version": "4.0.0-beta.371"
         },
         "nightly": {
-            "version": "4.0.0-beta.371"
+            "version": "4.0.0-beta.372"
         },
         "helper": {
             "version": "1.0.4"
@@ -16,4 +16,4 @@
             "version": "0.0.15"
         }
     }
-}
\ No newline at end of file
+}

From 131a3920f0ac9a234d91317e259d0521a5ed0b18 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 20 Nov 2024 17:57:53 +0100
Subject: [PATCH 13/15] convert activity_log to jsonb + add more index for
 queries

---
 ...11_11_125366_add_index_to_activity_log.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 database/migrations/2024_11_11_125366_add_index_to_activity_log.php

diff --git a/database/migrations/2024_11_11_125366_add_index_to_activity_log.php b/database/migrations/2024_11_11_125366_add_index_to_activity_log.php
new file mode 100644
index 000000000..9565187d0
--- /dev/null
+++ b/database/migrations/2024_11_11_125366_add_index_to_activity_log.php
@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class AddIndexToActivityLog extends Migration
+{
+    public function up()
+    {
+        DB::statement('ALTER TABLE activity_log ALTER COLUMN properties TYPE jsonb USING properties::jsonb');
+        DB::statement('CREATE INDEX idx_activity_type_uuid ON activity_log USING GIN (properties jsonb_path_ops)');
+    }
+
+    public function down()
+    {
+        DB::statement('DROP INDEX IF EXISTS idx_activity_type_uuid');
+        DB::statement('ALTER TABLE activity_log ALTER COLUMN properties TYPE json USING properties::json');
+
+    }
+}

From 6da5221503662d7faf130a968b6c5b79e004a0b5 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:22:37 +0100
Subject: [PATCH 14/15] fix smtp port mailpit

---
 templates/compose/mailpit.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/compose/mailpit.yaml b/templates/compose/mailpit.yaml
index 96aacd7bc..c136696a9 100644
--- a/templates/compose/mailpit.yaml
+++ b/templates/compose/mailpit.yaml
@@ -7,6 +7,8 @@
 services:
   mailpit:
     image: axllent/mailpit
+    ports:
+      - 1025:1025
     volumes:
       - "mailpit-data:/data"
       - type: bind

From 9dd982b722f342dfe614ae6135de9ae97b2b9a8b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Nov 2024 20:13:25 +0100
Subject: [PATCH 15/15] CoolifyTask should be on high queue

---
 app/Actions/CoolifyTask/PrepareCoolifyTask.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Actions/CoolifyTask/PrepareCoolifyTask.php b/app/Actions/CoolifyTask/PrepareCoolifyTask.php
index 6676b7937..ab5c7424a 100644
--- a/app/Actions/CoolifyTask/PrepareCoolifyTask.php
+++ b/app/Actions/CoolifyTask/PrepareCoolifyTask.php
@@ -3,7 +3,6 @@
 namespace App\Actions\CoolifyTask;
 
 use App\Data\CoolifyTaskArgs;
-use App\Enums\ActivityTypes;
 use App\Jobs\CoolifyTask;
 use Spatie\Activitylog\Models\Activity;
 
@@ -47,11 +46,7 @@ class PrepareCoolifyTask
             call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish,
             call_event_data: $this->remoteProcessArgs->call_event_data,
         );
-        if ($this->remoteProcessArgs->type === ActivityTypes::COMMAND->value) {
-            dispatch($job)->onQueue('high');
-        } else {
-            dispatch($job);
-        }
+        dispatch($job)->onQueue('high');
         $this->activity->refresh();
 
         return $this->activity;