From 9df0a2e54524ff97c972303a201827c490bdf103 Mon Sep 17 00:00:00 2001
From: Jason Hollis <400979+CodeBleu@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:08:43 -0500
Subject: [PATCH 01/30] fix: Better handling of errors with install script

---
 scripts/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/install.sh b/scripts/install.sh
index b7afeaefb..69a7a3eb0 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 ## Do not modify this file. You will lose the ability to install and auto-update!
 
+set -e # Exit immediately if a command exits with a non-zero status
+set -u # Treat unset variables as an error and exit
+set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
+
 VERSION="1.1.0"
 DOCKER_VERSION="24.0"
 

From c1f6bf41f510fb5e26db96d791317a89f9e413a1 Mon Sep 17 00:00:00 2001
From: Jason Hollis <400979+CodeBleu@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:54:06 -0500
Subject: [PATCH 02/30] fix: Install script parse version

    * Allow version to be passed with v or V at the beginning of
      version.  This allows users to pass along the actual github tagged
      version as it is listed on github.
    * Linting updates
---
 scripts/install.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 69a7a3eb0..471f640ed 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -9,8 +9,8 @@ VERSION="1.1.0"
 DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
-OS_TYPE=$(cat /etc/os-release | grep -w "ID" | cut -d "=" -f 2 | tr -d '"')
-OS_VERSION=$(cat /etc/os-release | grep -w "VERSION_ID" | cut -d "=" -f 2 | tr -d '"')
+OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
+OS_VERSION=$(grep -w "VERSION_ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
 LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | sed -n '2p' | xargs | awk '{print $2}' | tr -d ',')
 DATE=$(date +"%Y%m%d-%H%M%S")
 
@@ -30,6 +30,8 @@ esac
 # Ovewrite LATEST_VERSION if user pass a version number
 if [ "$1" != "" ]; then
     LATEST_VERSION=$1
+    LATEST_VERSION="${LATEST_VERSION,,}"
+    LATEST_VERSION="${LATEST_VERSION#v}"
 fi
 
 echo -e "-------------"
@@ -83,8 +85,8 @@ fi
 echo -e "-------------"
 echo -e "Check Docker Configuration..."
 mkdir -p /etc/docker
-
-test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json /etc/docker/daemon.json.original-$DATE || cat >/etc/docker/daemon.json <<EOL
+# shellcheck disable=SC2015
+test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json /etc/docker/daemon.json.original-"$DATE" || cat >/etc/docker/daemon.json <<EOL
 {
   "log-driver": "json-file",
   "log-opts": {
@@ -102,11 +104,15 @@ cat >/etc/docker/daemon.json.coolify <<EOL
   }
 }
 EOL
-cat <<<$(jq . /etc/docker/daemon.json.coolify) >/etc/docker/daemon.json.coolify
-cat <<<$(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) >/etc/docker/daemon.json
+TEMP_FILE=$(mktemp)
+if ! jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify > "$TEMP_FILE"; then
+ echo "Error merging JSON files"
+ exit 1
+fi
+mv "$TEMP_FILE" /etc/docker/daemon.json
 
-if [ -s /etc/docker/daemon.json.original-$DATE ]; then
-    DIFF=$(diff <(jq --sort-keys . /etc/docker/daemon.json) <(jq --sort-keys . /etc/docker/daemon.json.original-$DATE))
+if [ -s /etc/docker/daemon.json.original-"$DATE" ]; then
+    DIFF=$(diff <(jq --sort-keys . /etc/docker/daemon.json) <(jq --sort-keys . /etc/docker/daemon.json.original-"$DATE"))
     if [ "$DIFF" != "" ]; then
         echo "Docker configuration updated, restart docker daemon..."
         systemctl restart docker
@@ -167,11 +173,11 @@ if [ ! -f ~/.ssh/authorized_keys ]; then
     addSshKey
 fi
 
-if [ -z "$(grep -w "root@coolify" ~/.ssh/authorized_keys)" ]; then
+if ! grep -qw "root@coolify" ~/.ssh/authorized_keys; then
     addSshKey
 fi
 
-bash /data/coolify/source/upgrade.sh ${LATEST_VERSION:-latest}
+bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}"
 
 echo -e "\nCongratulations! Your Coolify instance is ready to use.\n"
 echo "Please visit http://$(curl -4s https://ifconfig.io):8000 to get started."

From 35134f23279ea27152b94fb7930440be5d4629a5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 16:32:41 +0100
Subject: [PATCH 03/30] fix: pusher host

---
 config/sentry.php                      | 2 +-
 config/version.php                     | 2 +-
 resources/views/layouts/base.blade.php | 7 ++++---
 versions.json                          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index 6ce447961..1cd69403b 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // 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.156',
+    'release' => '4.0.0-beta.157',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 0da84d93c..5c2f640e6 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.156';
+return '4.0.0-beta.157';
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 52da93d5c..74ca8583d 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -44,15 +44,16 @@
         </dialog>
         <x-toaster-hub />
         <x-version class="fixed left-2 bottom-1" />
-
         <script data-navigate-once>
             @auth
             window.Pusher = Pusher;
             window.Echo = new Echo({
                 broadcaster: 'pusher',
-                cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
+                cluster: "{{ env('PUSHER_HOST') }}" || "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" || window
+                    .location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
-                wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
+                wsHost: "{{ env('PUSHER_HOST') }}" || "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" || window
+                    .location.hostname,
                 wsPort: "{{ env('PUSHER_PORT') }}" || 6001,
                 wssPort: "{{ env('PUSHER_PORT') }}" || 6001,
                 forceTLS: false,
diff --git a/versions.json b/versions.json
index 96f7948dc..3d32bb83d 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.156"
+            "version": "4.0.0-beta.157"
         }
     }
 }

From 3ffa2b6b8dc6cc6e959c924a7b0722f3f5a5243b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 16:34:36 +0100
Subject: [PATCH 04/30] fix: add ipv6

---
 resources/views/layouts/base.blade.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 74ca8583d..1b8f50a19 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -49,11 +49,15 @@
             window.Pusher = Pusher;
             window.Echo = new Echo({
                 broadcaster: 'pusher',
-                cluster: "{{ env('PUSHER_HOST') }}" || "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" || window
-                    .location.hostname,
+                cluster: "{{ env('PUSHER_HOST') }}" ||
+                    "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" ||
+                    "{{ App\Models\InstanceSettings::get()->public_ipv6 }}" ||
+                    window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
-                wsHost: "{{ env('PUSHER_HOST') }}" || "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" || window
-                    .location.hostname,
+                wsHost: "{{ env('PUSHER_HOST') }}" ||
+                    "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" ||
+                    "{{ App\Models\InstanceSettings::get()->public_ipv6 }}" ||
+                    window.location.hostname,
                 wsPort: "{{ env('PUSHER_PORT') }}" || 6001,
                 wssPort: "{{ env('PUSHER_PORT') }}" || 6001,
                 forceTLS: false,

From 17c88721302b33f57ca67e906fd483d89de28365 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 18:06:29 +0100
Subject: [PATCH 05/30] fix: realtime connection?!

---
 app/Console/Commands/Init.php           |   1 +
 app/Livewire/Settings/Configuration.php |  34 +++++++
 app/Models/InstanceSettings.php         |  13 +++
 bootstrap/helpers/proxy.php             | 114 ++++++++++++++++++++++++
 docker-compose.dev.yml                  |   1 +
 docker-compose.prod.yml                 |   1 +
 resources/views/layouts/base.blade.php  |  15 ++--
 versions.json                           |   2 +-
 8 files changed, 170 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 79994b132..69e1100f4 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -36,6 +36,7 @@ class Init extends Command
         }
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_helper_containers();
+        setup_dynamic_configuration();
     }
     private function cleanup_stucked_helper_containers()
     {
diff --git a/app/Livewire/Settings/Configuration.php b/app/Livewire/Settings/Configuration.php
index 62ade961b..c2ed5f656 100644
--- a/app/Livewire/Settings/Configuration.php
+++ b/app/Livewire/Settings/Configuration.php
@@ -93,6 +93,14 @@ class Configuration extends Component
                             'service' => 'coolify',
                             'rule' => "Host(`{$host}`)",
                         ],
+                        'coolify-realtime-ws' =>
+                        [
+                            'entryPoints' => [
+                                0 => 'http',
+                            ],
+                            'service' => 'coolify-realtime',
+                            'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                        ],
                     ],
                     'services' =>
                     [
@@ -109,6 +117,19 @@ class Configuration extends Component
                                 ],
                             ],
                         ],
+                        'coolify-realtime' =>
+                        [
+                            'loadBalancer' =>
+                            [
+                                'servers' =>
+                                [
+                                    0 =>
+                                    [
+                                        'url' => 'http://coolify-realtime:6001',
+                                    ],
+                                ],
+                            ],
+                        ],
                     ],
                 ],
             ];
@@ -117,6 +138,9 @@ class Configuration extends Component
                 $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
                     0 => 'redirect-to-https@docker',
                 ];
+                $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss']['middlewares'] = [
+                    0 => 'redirect-to-https@docker',
+                ];
                 $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
                     'entryPoints' => [
                         0 => 'https',
@@ -127,6 +151,16 @@ class Configuration extends Component
                         'certresolver' => 'letsencrypt',
                     ],
                 ];
+                $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
+                    'entryPoints' => [
+                        0 => 'https',
+                    ],
+                    'service' => 'coolify-realtime',
+                    'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                    'tls' => [
+                        'certresolver' => 'letsencrypt',
+                    ],
+                ];
             }
             $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
         }
diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 846148159..2740a4c43 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -6,6 +6,7 @@ use App\Notifications\Channels\SendsEmail;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Request;
 use Spatie\Url\Url;
 
 class InstanceSettings extends Model implements SendsEmail
@@ -30,6 +31,18 @@ class InstanceSettings extends Model implements SendsEmail
             }
         );
     }
+    public static function realtimePort() {
+        $envDefined = env('PUSHER_PORT');
+        if ($envDefined != '6001') {
+            return $envDefined;
+        }
+        $url = Url::fromString(Request::getSchemeAndHttpHost());
+        if ($url->getScheme() === 'https') {
+            return 443;
+        } else {
+            return 6001;
+        }
+    }
     public static function get()
     {
         return InstanceSettings::findOrFail(0);
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 76fa9cc5a..9bb5d323e 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -2,7 +2,9 @@
 
 use App\Actions\Proxy\SaveConfiguration;
 use App\Models\Application;
+use App\Models\InstanceSettings;
 use App\Models\Server;
+use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 
 function get_proxy_path()
@@ -155,7 +157,119 @@ function generate_default_proxy_configuration(Server $server)
     SaveConfiguration::run($server, $config);
     return $config;
 }
+function setup_dynamic_configuration()
+{
+    $dynamic_config_path = get_proxy_path() . "/dynamic";
+    $settings = InstanceSettings::get();
+    $server = Server::findOrFail(0);
+    $file = "$dynamic_config_path/coolify.yaml";
+    if (empty($settings->fqdn)) {
+        instant_remote_process([
+            "rm -f $file",
+        ], $server);
+    } else {
+        $url = Url::fromString($settings->fqdn);
+        $host = $url->getHost();
+        $schema = $url->getScheme();
+        $traefik_dynamic_conf = [
+            'http' =>
+            [
+                'routers' =>
+                [
+                    'coolify-http' =>
+                    [
+                        'entryPoints' => [
+                            0 => 'http',
+                        ],
+                        'service' => 'coolify',
+                        'rule' => "Host(`{$host}`)",
+                    ],
+                    'coolify-ws' =>
+                    [
+                        'entryPoints' => [
+                            0 => 'http',
+                        ],
+                        'service' => 'coolify-realtime',
+                        'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                    ],
+                ],
+                'services' =>
+                [
+                    'coolify' =>
+                    [
+                        'loadBalancer' =>
+                        [
+                            'servers' =>
+                            [
+                                0 =>
+                                [
+                                    'url' => 'http://coolify:80',
+                                ],
+                            ],
+                        ],
+                    ],
+                    'coolify-realtime' =>
+                    [
+                        'loadBalancer' =>
+                        [
+                            'servers' =>
+                            [
+                                0 =>
+                                [
+                                    'url' => 'http://coolify-realtime:6001',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
 
+        if ($schema === 'https') {
+            $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
+                0 => 'redirect-to-https@docker',
+            ];
+            $traefik_dynamic_conf['http']['routers']['coolify-ws']['middlewares'] = [
+                0 => 'redirect-to-https@docker',
+            ];
+            $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
+                'entryPoints' => [
+                    0 => 'https',
+                ],
+                'service' => 'coolify',
+                'rule' => "Host(`{$host}`)",
+                'tls' => [
+                    'certresolver' => 'letsencrypt',
+                ],
+            ];
+            $traefik_dynamic_conf['http']['routers']['coolify-wss'] = [
+                'entryPoints' => [
+                    0 => 'https',
+                ],
+                'service' => 'coolify-realtime',
+                'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                'tls' => [
+                    'certresolver' => 'letsencrypt',
+                ],
+            ];
+        }
+        $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
+        $yaml =
+            "# This file is automatically generated by Coolify.\n" .
+            "# Do not edit it manually (only if you know what are you doing).\n\n" .
+            $yaml;
+
+        $base64 = base64_encode($yaml);
+        instant_remote_process([
+            "mkdir -p $dynamic_config_path",
+            "echo '$base64' | base64 -d > $file",
+        ], $server);
+
+        if (config('app.env') == 'local') {
+            ray($yaml);
+        }
+    }
+}
 function setup_default_redirect_404(string|null $redirect_url, Server $server)
 {
     $traefik_dynamic_conf_path = get_proxy_path() . "/dynamic";
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 44e51248e..2bec7be5e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -57,6 +57,7 @@ services:
       - "${FORWARD_SOKETI_PORT:-6001}:6001"
     environment:
       SOKETI_DEBUG: "true"
+      SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 80d1f8a79..4d71b8180 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -124,6 +124,7 @@ services:
       - "${SOKETI_PORT:-6001}:6001"
     environment:
       SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
+      SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 1b8f50a19..795241002 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -49,17 +49,12 @@
             window.Pusher = Pusher;
             window.Echo = new Echo({
                 broadcaster: 'pusher',
-                cluster: "{{ env('PUSHER_HOST') }}" ||
-                    "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" ||
-                    "{{ App\Models\InstanceSettings::get()->public_ipv6 }}" ||
-                    window.location.hostname,
+                cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
-                wsHost: "{{ env('PUSHER_HOST') }}" ||
-                    "{{ App\Models\InstanceSettings::get()->public_ipv4 }}" ||
-                    "{{ App\Models\InstanceSettings::get()->public_ipv6 }}" ||
-                    window.location.hostname,
-                wsPort: "{{ env('PUSHER_PORT') }}" || 6001,
-                wssPort: "{{ env('PUSHER_PORT') }}" || 6001,
+                wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
+                wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
+                wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
+                wsPath: '/realtime',
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,
diff --git a/versions.json b/versions.json
index 3d32bb83d..fb9be4be3 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.157"
+            "version": "4.0.0-beta.153"
         }
     }
 }

From 6d9a66ff1b1c731ec59821ea9f993c97217b4b04 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 18:48:00 +0100
Subject: [PATCH 06/30] fix: websocket

---
 bootstrap/helpers/proxy.php            | 10 +++++-----
 docker-compose.dev.yml                 |  1 -
 docker-compose.prod.yml                |  1 -
 resources/views/layouts/base.blade.php |  1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 9bb5d323e..acd745c53 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -184,13 +184,13 @@ function setup_dynamic_configuration()
                         'service' => 'coolify',
                         'rule' => "Host(`{$host}`)",
                     ],
-                    'coolify-ws' =>
+                    'coolify-realtime-ws' =>
                     [
                         'entryPoints' => [
                             0 => 'http',
                         ],
                         'service' => 'coolify-realtime',
-                        'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                        'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
                     ],
                 ],
                 'services' =>
@@ -229,7 +229,7 @@ function setup_dynamic_configuration()
             $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
                 0 => 'redirect-to-https@docker',
             ];
-            $traefik_dynamic_conf['http']['routers']['coolify-ws']['middlewares'] = [
+            $traefik_dynamic_conf['http']['routers']['coolify-realtime-ws']['middlewares'] = [
                 0 => 'redirect-to-https@docker',
             ];
             $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
@@ -242,12 +242,12 @@ function setup_dynamic_configuration()
                     'certresolver' => 'letsencrypt',
                 ],
             ];
-            $traefik_dynamic_conf['http']['routers']['coolify-wss'] = [
+            $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
                 'entryPoints' => [
                     0 => 'https',
                 ],
                 'service' => 'coolify-realtime',
-                'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
+                'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
                 'tls' => [
                     'certresolver' => 'letsencrypt',
                 ],
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 2bec7be5e..44e51248e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -57,7 +57,6 @@ services:
       - "${FORWARD_SOKETI_PORT:-6001}:6001"
     environment:
       SOKETI_DEBUG: "true"
-      SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 4d71b8180..80d1f8a79 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -124,7 +124,6 @@ services:
       - "${SOKETI_PORT:-6001}:6001"
     environment:
       SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
-      SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 795241002..a1889537e 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -54,7 +54,6 @@
                 wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
                 wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
-                wsPath: '/realtime',
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,

From 423dfc6280c90197371db65260a260df89ec2286 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:02:06 +0100
Subject: [PATCH 07/30] fix

---
 app/Models/InstanceSettings.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 2740a4c43..32d04e9b5 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -37,6 +37,10 @@ class InstanceSettings extends Model implements SendsEmail
             return $envDefined;
         }
         $url = Url::fromString(Request::getSchemeAndHttpHost());
+        $port = $url->getPort();
+        if ($port) {
+            return 6001;
+        }
         if ($url->getScheme() === 'https') {
             return 443;
         } else {

From f0ee26cd86c8c18552639f88a295d24e8d806c8f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:11:29 +0100
Subject: [PATCH 08/30] fix realtimePort

---
 app/Providers/AppServiceProvider.php   | 3 ++-
 resources/views/layouts/base.blade.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index c50a53bef..bd0ea1477 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Sanctum\Sanctum;
 use App\Models\PersonalAccessToken;
+use Illuminate\Support\Facades\Config;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -16,7 +17,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class);
-
         Http::macro('github', function (string $api_url, string|null $github_access_token = null) {
             if ($github_access_token) {
                 return Http::withHeaders([
@@ -30,5 +30,6 @@ class AppServiceProvider extends ServiceProvider
                 ])->baseUrl($api_url);
             }
         });
+        view()->share('realtimePort', \App\Models\InstanceSettings::realtimePort() );
     }
 }
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index a1889537e..b7ec65b1c 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -52,8 +52,8 @@
                 cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
                 wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
-                wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
-                wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
+                wsPort: "{{ $realtimePort }}",
+                wssPort: "{{ $realtimePort }}",
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,

From 40716550ec3e5f15b571b3260c6ad533b5711146 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:16:17 +0100
Subject: [PATCH 09/30] fix

---
 app/Models/InstanceSettings.php        | 8 +++-----
 resources/views/layouts/base.blade.php | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 32d04e9b5..65cbde08a 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -31,7 +31,8 @@ class InstanceSettings extends Model implements SendsEmail
             }
         );
     }
-    public static function realtimePort() {
+    public static function realtimePort()
+    {
         $envDefined = env('PUSHER_PORT');
         if ($envDefined != '6001') {
             return $envDefined;
@@ -40,11 +41,8 @@ class InstanceSettings extends Model implements SendsEmail
         $port = $url->getPort();
         if ($port) {
             return 6001;
-        }
-        if ($url->getScheme() === 'https') {
-            return 443;
         } else {
-            return 6001;
+            return null;
         }
     }
     public static function get()
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index b7ec65b1c..3467d05c9 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -42,6 +42,7 @@
                 <button>close</button>
             </form>
         </dialog>
+        {{$realtimePort}}
         <x-toaster-hub />
         <x-version class="fixed left-2 bottom-1" />
         <script data-navigate-once>

From f4d7c4f9420435ca24c617520f64375768222324 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:25:35 +0100
Subject: [PATCH 10/30] update

---
 resources/views/layouts/base.blade.php       | 1 -
 resources/views/livewire/dashboard.blade.php | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 3467d05c9..b7ec65b1c 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -42,7 +42,6 @@
                 <button>close</button>
             </form>
         </dialog>
-        {{$realtimePort}}
         <x-toaster-hub />
         <x-version class="fixed left-2 bottom-1" />
         <script data-navigate-once>
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 70f25b8fb..8e1a48294 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,6 +3,8 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
+    Realtime Port: {{ $realtimePort ?? 'Not set' }}
+
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))
         <div class="rounded alert alert-success">

From ce721c176496fe7950d3bfd6b4c79303244333b4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:30:37 +0100
Subject: [PATCH 11/30] fix

---
 app/Models/InstanceSettings.php | 2 ++
 bootstrap/helpers/proxy.php     | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 65cbde08a..fcc4c7e25 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -38,6 +38,8 @@ class InstanceSettings extends Model implements SendsEmail
             return $envDefined;
         }
         $url = Url::fromString(Request::getSchemeAndHttpHost());
+        $scheme = $url->getScheme();
+        ray($url);
         $port = $url->getPort();
         if ($port) {
             return 6001;
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index acd745c53..3fa657216 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -229,9 +229,7 @@ function setup_dynamic_configuration()
             $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
                 0 => 'redirect-to-https@docker',
             ];
-            $traefik_dynamic_conf['http']['routers']['coolify-realtime-ws']['middlewares'] = [
-                0 => 'redirect-to-https@docker',
-            ];
+
             $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
                 'entryPoints' => [
                     0 => 'https',

From ec5cca7b3efabf44ec96fc9d715ac7f1db3f56d1 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:34:23 +0100
Subject: [PATCH 12/30] feat: autoupdate env during seed

---
 database/seeders/ProductionSeeder.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index aaf07bb7a..6266aaa71 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -122,9 +122,15 @@ class ProductionSeeder extends Seeder
                 ]);
             }
         }
+        $settings = InstanceSettings::get();
 
+        if (env('AUTOUPDATE') === 'true') {
+            $settings->update(['is_auto_update_enabled' => true]);
+        }
+        if (env('AUTOUPDATE') === 'false') {
+            $settings->update(['is_auto_update_enabled' => false]);
+        }
         try {
-            $settings = InstanceSettings::get();
             if (is_null($settings->public_ipv4)) {
                 $ipv4 = Process::run('curl -4s https://ifconfig.io')->output();
                 if ($ipv4) {

From 8a80dbd5d88b97f59f6022f913af629b11847620 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:36:44 +0100
Subject: [PATCH 13/30] fix

---
 app/Models/InstanceSettings.php              | 2 +-
 app/Providers/AppServiceProvider.php         | 2 +-
 resources/views/layouts/base.blade.php       | 4 ++--
 resources/views/livewire/dashboard.blade.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index fcc4c7e25..d725b7e73 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -42,7 +42,7 @@ class InstanceSettings extends Model implements SendsEmail
         ray($url);
         $port = $url->getPort();
         if ($port) {
-            return 6001;
+            return '6001';
         } else {
             return null;
         }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index bd0ea1477..430d45085 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -30,6 +30,6 @@ class AppServiceProvider extends ServiceProvider
                 ])->baseUrl($api_url);
             }
         });
-        view()->share('realtimePort', \App\Models\InstanceSettings::realtimePort() );
+        Config::set('realtime.port', \App\Models\InstanceSettings::realtimePort());
     }
 }
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index b7ec65b1c..30b1603a5 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -52,8 +52,8 @@
                 cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
                 wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
-                wsPort: "{{ $realtimePort }}",
-                wssPort: "{{ $realtimePort }}",
+                wsPort: "{{ config('realtime.port') }}",
+                wssPort: "{{ config('realtime.port') }}",
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 8e1a48294..f1f639952 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,7 +3,7 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
-    Realtime Port: {{ $realtimePort ?? 'Not set' }}
+    Realtime Port: {{ config('realtime.port') ?? 'Not set' }}
 
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))

From a19a58338cc6b1da349bd1817bd88f9c718e9243 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:39:27 +0100
Subject: [PATCH 14/30] debug on

---
 app/Models/InstanceSettings.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index d725b7e73..0f89bf409 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -6,6 +6,7 @@ use App\Notifications\Channels\SendsEmail;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
 use Spatie\Url\Url;
 
@@ -38,6 +39,8 @@ class InstanceSettings extends Model implements SendsEmail
             return $envDefined;
         }
         $url = Url::fromString(Request::getSchemeAndHttpHost());
+        Log::info(Request::getSchemeAndHttpHost());
+        Log::info($url);
         $scheme = $url->getScheme();
         ray($url);
         $port = $url->getPort();

From 4f800f533196c7a63dc09dbd71f8f5ef3f60804e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 19:46:46 +0100
Subject: [PATCH 15/30] hmm, why

---
 app/Providers/AppServiceProvider.php         | 2 +-
 config/coolify.php                           | 1 +
 resources/views/layouts/base.blade.php       | 4 ++--
 resources/views/livewire/dashboard.blade.php | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 430d45085..eb219a568 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -30,6 +30,6 @@ class AppServiceProvider extends ServiceProvider
                 ])->baseUrl($api_url);
             }
         });
-        Config::set('realtime.port', \App\Models\InstanceSettings::realtimePort());
+        Config::set('coolify.realtime_port', \App\Models\InstanceSettings::realtimePort());
     }
 }
diff --git a/config/coolify.php b/config/coolify.php
index 05917d17a..955a2120a 100644
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -2,6 +2,7 @@
 
 return [
     'docs' => 'https://coolify.io/docs/contact',
+    'realtime_port' => "6001",
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 30b1603a5..559eb73b0 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -52,8 +52,8 @@
                 cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
                 wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
-                wsPort: "{{ config('realtime.port') }}",
-                wssPort: "{{ config('realtime.port') }}",
+                wsPort: "{{ config('coolify.realtime_port') }}",
+                wssPort: "{{ config('coolify.realtime_port') }}",
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index f1f639952..f4c013c2c 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,7 +3,7 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
-    Realtime Port: {{ config('realtime.port') ?? 'Not set' }}
+    Realtime Port: {{ config('coolify.realtime_port') ?? 'Not set' }}
 
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))

From d79da996d38868d881a19b8d76940c396f93580b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:01:54 +0100
Subject: [PATCH 16/30] fix

---
 app/Models/InstanceSettings.php              | 18 ------------------
 app/Providers/AppServiceProvider.php         |  1 -
 bootstrap/helpers/shared.php                 | 17 +++++++++++++++++
 config/coolify.php                           |  1 -
 resources/views/layouts/base.blade.php       |  4 ++--
 resources/views/livewire/dashboard.blade.php |  2 +-
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 0f89bf409..0705ef1a1 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -32,24 +32,6 @@ class InstanceSettings extends Model implements SendsEmail
             }
         );
     }
-    public static function realtimePort()
-    {
-        $envDefined = env('PUSHER_PORT');
-        if ($envDefined != '6001') {
-            return $envDefined;
-        }
-        $url = Url::fromString(Request::getSchemeAndHttpHost());
-        Log::info(Request::getSchemeAndHttpHost());
-        Log::info($url);
-        $scheme = $url->getScheme();
-        ray($url);
-        $port = $url->getPort();
-        if ($port) {
-            return '6001';
-        } else {
-            return null;
-        }
-    }
     public static function get()
     {
         return InstanceSettings::findOrFail(0);
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index eb219a568..f195446f8 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -30,6 +30,5 @@ class AppServiceProvider extends ServiceProvider
                 ])->baseUrl($api_url);
             }
         });
-        Config::set('coolify.realtime_port', \App\Models\InstanceSettings::realtimePort());
     }
 }
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 4f0fda777..98cedf357 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -29,7 +29,9 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
@@ -1545,3 +1547,18 @@ function generateEnvValue(string $command)
     }
     return $generatedValue;
 }
+
+function getRealtime() {
+    $envDefined = env('PUSHER_PORT');
+    if ($envDefined != '6001') {
+        return $envDefined;
+    }
+    $url = Url::fromString(Request::getSchemeAndHttpHost());
+    Log::info(Request::getSchemeAndHttpHost());
+    $port = $url->getPort();
+    if ($port) {
+        return '6001';
+    } else {
+        return null;
+    }
+}
diff --git a/config/coolify.php b/config/coolify.php
index 955a2120a..05917d17a 100644
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -2,7 +2,6 @@
 
 return [
     'docs' => 'https://coolify.io/docs/contact',
-    'realtime_port' => "6001",
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 559eb73b0..664ec7568 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -52,8 +52,8 @@
                 cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
                 key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
                 wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
-                wsPort: "{{ config('coolify.realtime_port') }}",
-                wssPort: "{{ config('coolify.realtime_port') }}",
+                wsPort: "{{ getRealtime() }}",
+                wssPort: "{{ getRealtime() }}",
                 forceTLS: false,
                 encrypted: true,
                 enableStats: false,
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index f4c013c2c..6c43b7735 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,7 +3,7 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
-    Realtime Port: {{ config('coolify.realtime_port') ?? 'Not set' }}
+    Realtime Port: {{ getRealtime() ?? 'Not set' }}
 
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))

From ccb9769e678aee1a77c9568962452246275f1f72 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:13:41 +0100
Subject: [PATCH 17/30] finally works?

---
 bootstrap/helpers/shared.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 98cedf357..9880506d1 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1548,17 +1548,18 @@ function generateEnvValue(string $command)
     return $generatedValue;
 }
 
-function getRealtime() {
+function getRealtime()
+{
     $envDefined = env('PUSHER_PORT');
-    if ($envDefined != '6001') {
+    if (is_null($envDefined)) {
+        $url = Url::fromString(Request::getSchemeAndHttpHost());
+        $port = $url->getPort();
+        if ($port) {
+            return '6001';
+        } else {
+            return null;
+        }
+    } else {
         return $envDefined;
     }
-    $url = Url::fromString(Request::getSchemeAndHttpHost());
-    Log::info(Request::getSchemeAndHttpHost());
-    $port = $url->getPort();
-    if ($port) {
-        return '6001';
-    } else {
-        return null;
-    }
 }

From 601a1e128e79a68104206a666895ac18ad4cb947 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:22:31 +0100
Subject: [PATCH 18/30] fixes

---
 app/Providers/AppServiceProvider.php         | 1 -
 bootstrap/helpers/shared.php                 | 2 +-
 docker-compose.dev.yml                       | 2 +-
 resources/views/livewire/dashboard.blade.php | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index f195446f8..d0618f406 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -6,7 +6,6 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Sanctum\Sanctum;
 use App\Models\PersonalAccessToken;
-use Illuminate\Support\Facades\Config;
 
 class AppServiceProvider extends ServiceProvider
 {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 9880506d1..d9cec50d5 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1551,7 +1551,7 @@ function generateEnvValue(string $command)
 function getRealtime()
 {
     $envDefined = env('PUSHER_PORT');
-    if (is_null($envDefined)) {
+    if (empty($envDefined)) {
         $url = Url::fromString(Request::getSchemeAndHttpHost());
         $port = $url->getPort();
         if ($port) {
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 44e51248e..87b4bb6b5 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -22,7 +22,7 @@ services:
       AUTORUN_LARAVEL_STORAGE_LINK: "false"
       AUTORUN_LARAVEL_MIGRATION: "false"
       PUSHER_HOST: "${PUSHER_HOST}"
-      PUSHER_PORT: "${PUSHER_PORT:-6001}"
+      PUSHER_PORT: "${PUSHER_PORT}"
       PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
       PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
       PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 6c43b7735..70f25b8fb 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,8 +3,6 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
-    Realtime Port: {{ getRealtime() ?? 'Not set' }}
-
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))
         <div class="rounded alert alert-success">

From 24a1f02af54ca4e271608e929eeb08580a14af94 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:27:49 +0100
Subject: [PATCH 19/30] version++

---
 versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.json b/versions.json
index fb9be4be3..3d32bb83d 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.153"
+            "version": "4.0.0-beta.157"
         }
     }
 }

From dd99ad0af8f505b66b8ab54c5e85108c606c65c6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:29:40 +0100
Subject: [PATCH 20/30] fix fox

---
 app/Livewire/Settings/Configuration.php | 112 +-----------------------
 1 file changed, 1 insertion(+), 111 deletions(-)

diff --git a/app/Livewire/Settings/Configuration.php b/app/Livewire/Settings/Configuration.php
index c2ed5f656..43f4afb7a 100644
--- a/app/Livewire/Settings/Configuration.php
+++ b/app/Livewire/Settings/Configuration.php
@@ -71,117 +71,7 @@ class Configuration extends Component
 
     private function setup_instance_fqdn()
     {
-        $file = "$this->dynamic_config_path/coolify.yaml";
-        if (empty($this->settings->fqdn)) {
-            instant_remote_process([
-                "rm -f $file",
-            ], $this->server);
-        } else {
-            $url = Url::fromString($this->settings->fqdn);
-            $host = $url->getHost();
-            $schema = $url->getScheme();
-            $traefik_dynamic_conf = [
-                'http' =>
-                [
-                    'routers' =>
-                    [
-                        'coolify-http' =>
-                        [
-                            'entryPoints' => [
-                                0 => 'http',
-                            ],
-                            'service' => 'coolify',
-                            'rule' => "Host(`{$host}`)",
-                        ],
-                        'coolify-realtime-ws' =>
-                        [
-                            'entryPoints' => [
-                                0 => 'http',
-                            ],
-                            'service' => 'coolify-realtime',
-                            'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
-                        ],
-                    ],
-                    'services' =>
-                    [
-                        'coolify' =>
-                        [
-                            'loadBalancer' =>
-                            [
-                                'servers' =>
-                                [
-                                    0 =>
-                                    [
-                                        'url' => 'http://coolify:80',
-                                    ],
-                                ],
-                            ],
-                        ],
-                        'coolify-realtime' =>
-                        [
-                            'loadBalancer' =>
-                            [
-                                'servers' =>
-                                [
-                                    0 =>
-                                    [
-                                        'url' => 'http://coolify-realtime:6001',
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ];
+        setup_dynamic_configuration();
 
-            if ($schema === 'https') {
-                $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
-                ];
-                $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
-                ];
-                $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
-                    'entryPoints' => [
-                        0 => 'https',
-                    ],
-                    'service' => 'coolify',
-                    'rule' => "Host(`{$host}`)",
-                    'tls' => [
-                        'certresolver' => 'letsencrypt',
-                    ],
-                ];
-                $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
-                    'entryPoints' => [
-                        0 => 'https',
-                    ],
-                    'service' => 'coolify-realtime',
-                    'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)",
-                    'tls' => [
-                        'certresolver' => 'letsencrypt',
-                    ],
-                ];
-            }
-            $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-        }
-    }
-
-    private function save_configuration_to_disk(array $traefik_dynamic_conf, string $file)
-    {
-        $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
-        $yaml =
-            "# This file is automatically generated by Coolify.\n" .
-            "# Do not edit it manually (only if you know what are you doing).\n\n" .
-            $yaml;
-
-        $base64 = base64_encode($yaml);
-        instant_remote_process([
-            "mkdir -p $this->dynamic_config_path",
-            "echo '$base64' | base64 -d > $file",
-        ], $this->server);
-
-        if (config('app.env') == 'local') {
-            ray($yaml);
-        }
     }
 }

From 60c8e0d625bf72f01a178b978764fa093b2ee1fa Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:40:05 +0100
Subject: [PATCH 21/30] feat: disable autoupdate

---
 .env.production                       | 2 ++
 database/seeders/ProductionSeeder.php | 5 ++---
 docker-compose.prod.yml               | 1 +
 scripts/install.sh                    | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.env.production b/.env.production
index f15a8b0e9..d92c9ce27 100644
--- a/.env.production
+++ b/.env.production
@@ -8,3 +8,5 @@ REDIS_PASSWORD=
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+
+AUTOUPDATE=true
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index 6266aaa71..04d699287 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -124,10 +124,9 @@ class ProductionSeeder extends Seeder
         }
         $settings = InstanceSettings::get();
 
-        if (env('AUTOUPDATE') === 'true') {
+        if (env('AUTOUPDATE')) {
             $settings->update(['is_auto_update_enabled' => true]);
-        }
-        if (env('AUTOUPDATE') === 'false') {
+        } else {
             $settings->update(['is_auto_update_enabled' => false]);
         }
         try {
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 80d1f8a79..2ec79158d 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -43,6 +43,7 @@ services:
       - PUSHER_APP_ID
       - PUSHER_APP_KEY
       - PUSHER_APP_SECRET
+      - AUTOUPDATE
       - SELF_HOSTED
       - WAITLIST
       - SUBSCRIPTION_PROVIDER
diff --git a/scripts/install.sh b/scripts/install.sh
index b7afeaefb..e935d65df 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -130,6 +130,13 @@ curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.p
 curl -fsSL $CDN/.env.production -o /data/coolify/source/.env.production
 curl -fsSL $CDN/upgrade.sh -o /data/coolify/source/upgrade.sh
 
+# Check if AUTOUPDATE env variable is set, if set use it, if not set to true
+if [ -z "$AUTOUPDATE" ]; then
+    AUTOUPDATE=true
+else
+    AUTOUPDATE=false
+fi
+
 # Copy .env.example if .env does not exist
 if [ ! -f /data/coolify/source/.env ]; then
     cp /data/coolify/source/.env.production /data/coolify/source/.env
@@ -142,6 +149,8 @@ if [ ! -f /data/coolify/source/.env ]; then
     sed -i "s|PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|g" /data/coolify/source/.env
 fi
 
+sed -i "s|AUTOUPDATE=.*|AUTOUPDATE=$AUTOUPDATE|g" /data/coolify/source/.env
+
 # Merge .env and .env.production. New values will be added to .env
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env
 

From c803768e5f406124b7fa5ede1998161cd7b2a026 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 20:55:58 +0100
Subject: [PATCH 22/30] set autoupdate

---
 app/Console/Commands/Init.php         | 8 +++++++-
 database/seeders/ProductionSeeder.php | 7 +------
 scripts/install.sh                    | 9 ---------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 69e1100f4..d864c9c48 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -18,7 +18,6 @@ use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
 {
@@ -37,6 +36,13 @@ class Init extends Command
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_helper_containers();
         setup_dynamic_configuration();
+
+        $settings = InstanceSettings::get();
+        if (env('AUTOUPDATE') == true) {
+            $settings->update(['is_auto_update_enabled' => true]);
+        } else {
+            $settings->update(['is_auto_update_enabled' => false]);
+        }
     }
     private function cleanup_stucked_helper_containers()
     {
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index 04d699287..aaf07bb7a 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -122,14 +122,9 @@ class ProductionSeeder extends Seeder
                 ]);
             }
         }
-        $settings = InstanceSettings::get();
 
-        if (env('AUTOUPDATE')) {
-            $settings->update(['is_auto_update_enabled' => true]);
-        } else {
-            $settings->update(['is_auto_update_enabled' => false]);
-        }
         try {
+            $settings = InstanceSettings::get();
             if (is_null($settings->public_ipv4)) {
                 $ipv4 = Process::run('curl -4s https://ifconfig.io')->output();
                 if ($ipv4) {
diff --git a/scripts/install.sh b/scripts/install.sh
index e935d65df..b7afeaefb 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -130,13 +130,6 @@ curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.p
 curl -fsSL $CDN/.env.production -o /data/coolify/source/.env.production
 curl -fsSL $CDN/upgrade.sh -o /data/coolify/source/upgrade.sh
 
-# Check if AUTOUPDATE env variable is set, if set use it, if not set to true
-if [ -z "$AUTOUPDATE" ]; then
-    AUTOUPDATE=true
-else
-    AUTOUPDATE=false
-fi
-
 # Copy .env.example if .env does not exist
 if [ ! -f /data/coolify/source/.env ]; then
     cp /data/coolify/source/.env.production /data/coolify/source/.env
@@ -149,8 +142,6 @@ if [ ! -f /data/coolify/source/.env ]; then
     sed -i "s|PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|g" /data/coolify/source/.env
 fi
 
-sed -i "s|AUTOUPDATE=.*|AUTOUPDATE=$AUTOUPDATE|g" /data/coolify/source/.env
-
 # Merge .env and .env.production. New values will be added to .env
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env
 

From 5159d471590236fc785e7e449daaa1af70cbf8a2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:07:40 +0100
Subject: [PATCH 23/30] fix install script

---
 scripts/install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 471f640ed..5716ba2b6 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,7 +2,8 @@
 ## Do not modify this file. You will lose the ability to install and auto-update!
 
 set -e # Exit immediately if a command exits with a non-zero status
-set -u # Treat unset variables as an error and exit
+## $1 could be empty, so we need to disable this check
+#set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
 
 VERSION="1.1.0"
@@ -155,6 +156,11 @@ fi
 # Merge .env and .env.production. New values will be added to .env
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env
 
+# Check if AUTOUPDATE value is true in env, not in env file and it is not set in .env
+if [ "$AUTOUPDATE" = "false" ]; then
+    sed -i "s|AUTOUPDATE=.*|AUTOUPDATE=false|g" /data/coolify/source/.env
+fi
+
 # Generate an ssh key (ed25519) at /data/coolify/ssh/keys/id.root@host.docker.internal
 if [ ! -f /data/coolify/ssh/keys/id.root@host.docker.internal ]; then
     ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.root@host.docker.internal -q -N "" -C root@coolify

From 6ae87466ca6fd77aa506fe940537055e80c62657 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:19:45 +0100
Subject: [PATCH 24/30] fix: only allow to modify in .env file if AUTOUPDATE is
 set

---
 .env.production                                     |  2 --
 .../views/livewire/settings/configuration.blade.php |  6 +++++-
 scripts/install.sh                                  | 13 ++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.env.production b/.env.production
index d92c9ce27..f15a8b0e9 100644
--- a/.env.production
+++ b/.env.production
@@ -8,5 +8,3 @@ REDIS_PASSWORD=
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
-
-AUTOUPDATE=true
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index 2a31e840a..a47da5b21 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,7 +21,11 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
+        @if (env('AUTOUPDATE') == 'true')
+            <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Coolify" />
+        @else
+            <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
+        @endif
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
         @if ($next_channel)
diff --git a/scripts/install.sh b/scripts/install.sh
index 5716ba2b6..eed99dbbb 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -106,9 +106,9 @@ cat >/etc/docker/daemon.json.coolify <<EOL
 }
 EOL
 TEMP_FILE=$(mktemp)
-if ! jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify > "$TEMP_FILE"; then
- echo "Error merging JSON files"
- exit 1
+if ! jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify >"$TEMP_FILE"; then
+    echo "Error merging JSON files"
+    exit 1
 fi
 mv "$TEMP_FILE" /etc/docker/daemon.json
 
@@ -156,9 +156,12 @@ fi
 # Merge .env and .env.production. New values will be added to .env
 sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env
 
-# Check if AUTOUPDATE value is true in env, not in env file and it is not set in .env
 if [ "$AUTOUPDATE" = "false" ]; then
-    sed -i "s|AUTOUPDATE=.*|AUTOUPDATE=false|g" /data/coolify/source/.env
+    if ! grep -q "AUTOUPDATE=" /data/coolify/source/.env; then
+        echo "AUTOUPDATE=false" >>/data/coolify/source/.env
+    else
+        sed -i "s|AUTOUPDATE=.*|AUTOUPDATE=false|g" /data/coolify/source/.env
+    fi
 fi
 
 # Generate an ssh key (ed25519) at /data/coolify/ssh/keys/id.root@host.docker.internal

From 7a97a4b69c9dd201e22ecfc14390767286a7ff24 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:23:33 +0100
Subject: [PATCH 25/30] fixes

---
 resources/views/livewire/settings/configuration.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index a47da5b21..e8482fa66 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,7 +21,7 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        @if (env('AUTOUPDATE') == 'true')
+        @if (env('AUTOUPDATE'))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
             <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />

From 4f3f98be0a056f437fe749d90178185b5accf969 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:26:18 +0100
Subject: [PATCH 26/30] fix

---
 resources/views/livewire/settings/configuration.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index e8482fa66..fc11a1c41 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,11 +21,11 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        @if (env('AUTOUPDATE'))
+        @isset(env('AUTOUPDATE'))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
             <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
-        @endif
+        @endisset
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
         @if ($next_channel)

From 41b6df0e6ef874af737e4ba90f9720a9c749e4e9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:26:21 +0100
Subject: [PATCH 27/30] fix

---
 resources/views/livewire/settings/configuration.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index fc11a1c41..e54b55984 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -22,7 +22,8 @@
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
         @isset(env('AUTOUPDATE'))
-            <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Coolify" />
+            <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
+                id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
             <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
         @endisset

From 41181cac1264624f4200ab05c50639f435dc87fa Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:30:13 +0100
Subject: [PATCH 28/30] asdasdasd time to sleep

---
 resources/views/livewire/settings/configuration.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index e54b55984..b2ddd8f9c 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,12 +21,12 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        @isset(env('AUTOUPDATE'))
+        @if(isset(env('AUTOUPDATE')))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
                 id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
             <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
-        @endisset
+        @endif
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
         @if ($next_channel)

From 1c71ac78e28e220d877428798099c771da3553e0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:35:09 +0100
Subject: [PATCH 29/30] fix

---
 config/coolify.php                                        | 1 +
 resources/views/livewire/settings/configuration.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/coolify.php b/config/coolify.php
index 05917d17a..be167fb80 100644
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -2,6 +2,7 @@
 
 return [
     'docs' => 'https://coolify.io/docs/contact',
+    'autoupdate' => env('AUTOUPDATE', null),
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index b2ddd8f9c..ec3579ba1 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,7 +21,7 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        @if(isset(env('AUTOUPDATE')))
+        @if(config('autoupdate'))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
                 id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else

From 87c3d0048cb6ecf5133e7c8601c2a3741822074a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Dec 2023 21:43:53 +0100
Subject: [PATCH 30/30] fix

---
 config/coolify.php                                        | 1 -
 resources/views/livewire/settings/configuration.blade.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/coolify.php b/config/coolify.php
index be167fb80..05917d17a 100644
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -2,7 +2,6 @@
 
 return [
     'docs' => 'https://coolify.io/docs/contact',
-    'autoupdate' => env('AUTOUPDATE', null),
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index ec3579ba1..4abdbf600 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -21,7 +21,7 @@
     </form>
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
-        @if(config('autoupdate'))
+        @if(!is_null(env('AUTOUPDATE', null)))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
                 id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else