diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index a8a5f7d27..4a138eaca 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -39,7 +39,7 @@ class Heading extends Component } else { dispatch(new ServerStatusJob($this->application->destination->server)); } - if ($showNotification) $this->dispatch('success', "Application ({$this->application->name}) status updated."); + if ($showNotification) $this->dispatch('success', "Application status updated."); } public function force_deploy_without_cache() diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index 781888595..1ae92ff3a 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -229,11 +229,12 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_ $http_label = "http-{$loop}-{$uuid}"; $https_label = "https-{$loop}-{$uuid}"; + $labels->push("traefik.http.middlewares.gzip.compress=true"); + $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip"); if ($schema === 'https') { // Set labels for https $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)"); $labels->push("traefik.http.routers.{$https_label}.entryPoints=https"); - $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip"); if ($port) { $labels->push("traefik.http.routers.{$https_label}.service={$https_label}"); $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port"); @@ -254,13 +255,13 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_ $labels->push("traefik.http.routers.{$http_label}.service={$http_label}"); } if ($is_force_https_enabled) { + $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"); $labels->push("traefik.http.routers.{$http_label}.middlewares=redirect-to-https"); } } else { // Set labels for http $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)"); $labels->push("traefik.http.routers.{$http_label}.entryPoints=http"); - $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip"); if ($port) { $labels->push("traefik.http.services.{$http_label}.loadbalancer.server.port=$port"); $labels->push("traefik.http.routers.{$http_label}.service={$http_label}"); diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index 80eebe1a6..a273a90e0 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -103,9 +103,6 @@ function generate_default_proxy_configuration(Server $server) "traefik.http.routers.traefik.entrypoints=http", "traefik.http.routers.traefik.service=api@internal", "traefik.http.services.traefik.loadbalancer.server.port=8080", - // Global Middlewares - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https", - "traefik.http.middlewares.gzip.compress=true", ]; $config = [ "version" => "3.8", @@ -198,10 +195,23 @@ function setup_dynamic_configuration() $traefik_dynamic_conf = [ 'http' => [ + 'middlewares' => [ + 'redirect-to-https' => [ + 'redirectscheme' => [ + 'scheme' => 'https', + ], + ], + 'gzip' => [ + 'compress' => true, + ], + ], 'routers' => [ 'coolify-http' => [ + 'middlewares' => [ + 0 => 'gzip', + ], 'entryPoints' => [ 0 => 'http', ], @@ -251,7 +261,7 @@ function setup_dynamic_configuration() if ($schema === 'https') { $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [ - 0 => 'redirect-to-https@docker', + 0 => 'redirect-to-https', ]; $traefik_dynamic_conf['http']['routers']['coolify-https'] = [