From f8dd6cb956f97e4f55ff0e6b5786c84a85ddf428 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Sat, 8 Oct 2022 08:31:19 +0200 Subject: [PATCH] Remove unuused legacy https functionality --- .../instances/instances/barrel/.env.sample | 28 ------------------- internal/config/domains.go | 15 ---------- 2 files changed, 43 deletions(-) delete mode 100644 internal/component/instances/instances/barrel/.env.sample diff --git a/internal/component/instances/instances/barrel/.env.sample b/internal/component/instances/instances/barrel/.env.sample deleted file mode 100644 index 2d8200e..0000000 --- a/internal/component/instances/instances/barrel/.env.sample +++ /dev/null @@ -1,28 +0,0 @@ -####################### -# Meta Settings -####################### - -# Real path for volumes to be stored -DATA_PATH=/var/www/deploy/instances/example.slug/data -UTILS_DIR=/var/www/deploy/runtime/utils/ - -####################### -### Web Server settings -####################### -# the hostname for the website -VIRTUAL_HOST=example.com - -# optional letsencrypt support -# when blank, ignore -LETSENCRYPT_HOST= -LETSENCRYPT_EMAIL= - -### SQL settings -MYSQL_HOST=mysql -MYSQL_USER=user -MYSQL_PASS=pass - -### GraphDB settings -GRAPHDB_HOST=graphdb -GRAPHDB_USER=user -GRAPHDB_PASS=pass \ No newline at end of file diff --git a/internal/config/domains.go b/internal/config/domains.go index 05234b0..b6a4d00 100644 --- a/internal/config/domains.go +++ b/internal/config/domains.go @@ -30,27 +30,12 @@ func (cfg Config) HTTPSEnabledEnv() string { return "false" } -// IfHttps returns value when the distillery has https enabled, and the empty string otherwise. -func (cfg Config) IfHttps(value string) string { - if !cfg.HTTPSEnabled() { - return "" - } - return value -} - // DefaultHostRule returns the default traefik hostname rule for this distillery. // This consists of the [DefaultDomain] as well as [ExtraDomains]. func (cfg Config) DefaultHostRule() string { return cfg.HostRule(append([]string{cfg.DefaultDomain}, cfg.SelfExtraDomains...)...) } -// DefaultSSLHost returns the default hostname for the ssl version of the distillery. -// -// This is exactly [DefaultHost] when SSL is enabled, and the empty string otherwise. -func (cfg Config) xDefaultSSLHost() string { - panic("not implemented") -} - // SlugFromHost returns the slug belonging to the appropriate host.' // // When host is a top-level domain, returns "", true.