From 66b397e9daf9b5eb947b043427f6489718d7f259 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Thu, 10 Nov 2022 16:34:55 +0100 Subject: [PATCH] Rename ssh->legacyssh --- internal/dis/component/{ssh => legacyssh}/ssh.env | 0 internal/dis/component/{ssh => legacyssh}/ssh.go | 2 +- .../component/{ssh => legacyssh}/ssh/docker-compose.yml | 0 internal/dis/distillery.go | 7 ++----- 4 files changed, 3 insertions(+), 6 deletions(-) rename internal/dis/component/{ssh => legacyssh}/ssh.env (100%) rename internal/dis/component/{ssh => legacyssh}/ssh.go (97%) rename internal/dis/component/{ssh => legacyssh}/ssh/docker-compose.yml (100%) diff --git a/internal/dis/component/ssh/ssh.env b/internal/dis/component/legacyssh/ssh.env similarity index 100% rename from internal/dis/component/ssh/ssh.env rename to internal/dis/component/legacyssh/ssh.env diff --git a/internal/dis/component/ssh/ssh.go b/internal/dis/component/legacyssh/ssh.go similarity index 97% rename from internal/dis/component/ssh/ssh.go rename to internal/dis/component/legacyssh/ssh.go index decd976..76c8004 100644 --- a/internal/dis/component/ssh/ssh.go +++ b/internal/dis/component/legacyssh/ssh.go @@ -1,4 +1,4 @@ -package ssh +package legacyssh import ( "embed" diff --git a/internal/dis/component/ssh/ssh/docker-compose.yml b/internal/dis/component/legacyssh/ssh/docker-compose.yml similarity index 100% rename from internal/dis/component/ssh/ssh/docker-compose.yml rename to internal/dis/component/legacyssh/ssh/docker-compose.yml diff --git a/internal/dis/distillery.go b/internal/dis/distillery.go index e128d07..c5adce3 100644 --- a/internal/dis/distillery.go +++ b/internal/dis/distillery.go @@ -15,11 +15,11 @@ import ( "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances/malt" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/legacyssh" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/resolver" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/solr" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/ssh" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/triplestore" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/web" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" @@ -69,9 +69,6 @@ func (dis *Distillery) Control() *control.Control { func (dis *Distillery) Resolver() *resolver.Resolver { return export[*resolver.Resolver](dis) } -func (dis *Distillery) SSH() *ssh.SSH { - return export[*ssh.SSH](dis) -} func (dis *Distillery) SQL() *sql.SQL { return export[*sql.SQL](dis) } @@ -104,7 +101,7 @@ func (dis *Distillery) allComponents() []initFunc { return []initFunc{ auto[*web.Web], - auto[*ssh.SSH], + auto[*legacyssh.SSH], manual(func(ts *triplestore.Triplestore) { ts.BaseURL = "http://" + dis.Upstream.Triplestore