Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(service): always enable force https labels

Andras Bacsai16e85e27e83b
diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php
index cbd02daa63..7b8b46812d 100644
--- a/app/Models/ServiceApplication.php
+++ b/app/Models/ServiceApplication.php
@@ -81,11 +81,6 @@ class ServiceApplication extends BaseModel
return data_get($this, 'is_gzip_enabled', true);
}
- public function isForceHttpsEnabled()
- {
- return data_get($this, 'is_force_https_enabled', true);
- }
-
public function type()
{
return 'service';
diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index aee71295ac..f6a39cfe48 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -80,11 +80,6 @@ class ServiceDatabase extends BaseModel
return data_get($this, 'is_gzip_enabled', true);
}
- public function isForceHttpsEnabled()
- {
- return data_get($this, 'is_force_https_enabled', true);
- }
-
public function type()
{
return 'service';
diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.php
index 45125bce74..53060d28f4 100644
--- a/bootstrap/helpers/parsers.php
+++ b/bootstrap/helpers/parsers.php
@@ -2329,7 +2329,7 @@ function serviceParser(Service $resource): Collection
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $uuid,
domains: $fqdns,
- is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $originalResource->isGzipEnabled(),
is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2342,7 +2342,7 @@ function serviceParser(Service $resource): Collection
network: $network,
uuid: $uuid,
domains: $fqdns,
- is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $originalResource->isGzipEnabled(),
is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2356,7 +2356,7 @@ function serviceParser(Service $resource): Collection
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $uuid,
domains: $fqdns,
- is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $originalResource->isGzipEnabled(),
is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
@@ -2367,7 +2367,7 @@ function serviceParser(Service $resource): Collection
network: $network,
uuid: $uuid,
domains: $fqdns,
- is_force_https_enabled: $originalResource->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $originalResource->isGzipEnabled(),
is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 2a7d5cbb0f..4372ff955c 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1933,7 +1933,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $resource->uuid,
domains: $fqdns,
- is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1946,7 +1946,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
network: $resource->destination->network,
uuid: $resource->uuid,
domains: $fqdns,
- is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1959,7 +1959,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $resource->uuid,
domains: $fqdns,
- is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
@@ -1970,7 +1970,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
network: $resource->destination->network,
uuid: $resource->uuid,
domains: $fqdns,
- is_force_https_enabled: $savedService->isForceHttpsEnabled(),
+ is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),