internal: Remove legacyssh

This commit is contained in:
Tom Wiesing 2022-11-17 09:33:46 +01:00
parent f583580160
commit 2bcd70c1ec
No known key found for this signature in database
4 changed files with 0 additions and 61 deletions

View file

@ -1 +0,0 @@
DOCKER_NETWORK_NAME=${DOCKER_NETWORK_NAME}

View file

@ -1,37 +0,0 @@
package legacyssh
import (
"embed"
"path/filepath"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
)
type SSH struct {
component.Base
}
func (ssh *SSH) Path() string {
return filepath.Join(ssh.Still.Config.DeployRoot, "core", "ssh")
}
func (*SSH) Context(parent component.InstallationContext) component.InstallationContext {
return parent
}
//go:embed all:ssh
//go:embed ssh.env
var resources embed.FS
func (ssh *SSH) Stack(env environment.Environment) component.StackWithResources {
return component.MakeStack(ssh, env, component.StackWithResources{
Resources: resources,
ContextPath: "ssh",
EnvPath: "ssh.env",
EnvContext: map[string]string{
"DOCKER_NETWORK_NAME": ssh.Config.DockerNetworkName,
},
})
}

View file

@ -1,20 +0,0 @@
version: "3.7"
services:
ssh:
image: ghcr.io/tkw1536/dockersshd:latest
command: -hostkey /keys/hostkey -shell /user_shell.sh -keylabel eu.wiss-ki.barrel.authfile -userlabel eu.wiss-ki.barrel.slug -L triplestore:7200 -L phpmyadmin:80 -L sql:3306
ports:
- "2223:2222"
volumes:
- './data/keys:/keys'
- '/var/run/docker.sock:/var/run/docker.sock:ro'
labels:
- "eu.wiss-ki.barrel.distillery=${DOCKER_NETWORK_NAME}"
restart: always
networks:
default:
name: ${DOCKER_NETWORK_NAME}
external: true

View file

@ -15,7 +15,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" "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"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances/malt" "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/meta"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/resolver" "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/solr"
@ -109,8 +108,6 @@ func (dis *Distillery) allComponents() []initFunc {
return []initFunc{ return []initFunc{
auto[*web.Web], auto[*web.Web],
auto[*legacyssh.SSH],
manual(func(ts *triplestore.Triplestore) { manual(func(ts *triplestore.Triplestore) {
ts.BaseURL = "http://" + dis.Upstream.Triplestore ts.BaseURL = "http://" + dis.Upstream.Triplestore
ts.PollContext = dis.Context() ts.PollContext = dis.Context()