diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php index 7002fb989..77644519a 100644 --- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php +++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php @@ -139,6 +139,18 @@ class All extends Component case 'standalone-postgresql': $environment->standalone_postgresql_id = $this->resource->id; break; + case 'standalone-redis': + $environment->standalone_redis_id = $this->resource->id; + break; + case 'standalone-mongodb': + $environment->standalone_mongodb_id = $this->resource->id; + break; + case 'standalone-mysql': + $environment->standalone_mysql_id = $this->resource->id; + break; + case 'standalone-mariadb': + $environment->standalone_mariadb_id = $this->resource->id; + break; case 'service': $environment->service_id = $this->resource->id; break; diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index 0ff3d1344..a52c859e4 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -101,12 +101,27 @@ function generate_default_proxy_configuration(Server $server) $labels = [ "traefik.enable=true", "traefik.http.routers.traefik.entrypoints=http", - "traefik.http.routers.traefik.middlewares=traefik-basic-auth@file", "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", + // https WWW to non-WWW + "traefik.http.middlewares.https-www-to-non-www.redirectregex.regex=^https?://www\\.(.+)", + "traefik.http.middlewares.https-www-to-non-www.redirectregex.replacement=https://\$1", + "traefik.http.middlewares.https-www-to-non-www.redirectregex.permanent=true", + // https Non-WWW to WWW + "traefik.http.middlewares.https-non-www-to-www.redirectregex.regex=^https?://(?:www\\.)?(.+)", + "traefik.http.middlewares.https-non-www-to-www.redirectregex.replacement=https://www.\$\${1}", + "traefik.http.middlewares.https-non-www-to-www.redirectregex.permanent=true", + // http www to non-WWW + "traefik.http.middlewares.http-www-to-non-www.redirectregex.regex=^http://www\\.(.+)", + "traefik.http.middlewares.http-www-to-non-www.redirectregex.replacement=http://\$1", + "traefik.http.middlewares.http-www-to-non-www.redirectregex.permanent=true", + // http Non-WWW to WWW + "traefik.http.middlewares.http-non-www-to-www.redirectregex.regex=^http://(?:www\\.)?(.+)", + "traefik.http.middlewares.http-non-www-to-www.redirectregex.replacement=http://www.\$\${1}", + "traefik.http.middlewares.http-non-www-to-www.redirectregex.permanent=true", ]; $config = [ "version" => "3.8", diff --git a/config/sentry.php b/config/sentry.php index e243eb466..17b924911 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.182', + 'release' => '4.0.0-beta.183', // 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 e853b7527..c36192445 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@