From 01c7e7607115d917df6d6ef1ad154d2b44b2e8d3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 15 Jan 2024 13:23:28 +0100 Subject: [PATCH] only add gzip + https redirect once --- bootstrap/helpers/docker.php | 4 ++-- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index 10240c02c..0510e8d58 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -215,6 +215,8 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_ { $labels = collect([]); $labels->push('traefik.enable=true'); + $labels->push("traefik.http.middlewares.gzip.compress=true"); + $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"); foreach ($domains as $loop => $domain) { try { $uuid = new Cuid2(7); @@ -229,7 +231,6 @@ 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"); if ($schema === 'https') { // Set labels for https $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)"); @@ -256,7 +257,6 @@ 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 { diff --git a/config/sentry.php b/config/sentry.php index d8d09746b..4fedb1aa8 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.193', + 'release' => '4.0.0-beta.194', // 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 40ea0dab6..fd7baa8f1 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@