rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow not serving the toplevel domain

Browse source
This commit is contained in:
Tom Wiesing 2023-11-02 14:15:10 +01:00
parent a90c68bf5e
commit 5ef2e14ae9
No known key found for this signature in database
9 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/dis/component/auth/panel/ssh.go
View file

@ -62,7 +62,7 @@ func (panel *UserPanel) sshRoute(ctx context.Context) http.Handler {
return sc, err
}
sc.Domain = panel.Config.HTTP.PrimaryDomain
sc.Domain = panel.Config.HTTP.PublicTopDomain()
sc.Port = panel.Config.Listen.SSHPort
// pick the first domain that the user has access to as an example

2
internal/dis/component/server/home/home.go
View file

@ -42,7 +42,7 @@ func (home *Home) HandleRoute(ctx context.Context, route string) (http.Handler,
dflt.Fallback = home.publicHandler(ctx)
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
slug, ok := home.Config.HTTP.SlugFromHost(r.Host)
slug, ok := home.Config.HTTP.NormSlugFromHost(r.Host)
switch {
case !ok:
http.NotFound(w, r)

2
internal/dis/component/server/server.go
View file

@ -41,7 +41,7 @@ func (server *Server) Server(ctx context.Context, progress io.Writer) (public ht
var publicM, internalM mux.Mux[component.RouteContext]
publicM.Context = func(r *http.Request) component.RouteContext {
slug, ok := server.Still.Config.HTTP.SlugFromHost(r.Host)
slug, ok := server.Config.HTTP.NormSlugFromHost(r.Host)
return component.RouteContext{
DefaultDomain: slug == "" && ok,
}

12
internal/dis/component/server/server/docker-compose.yml
View file

@ -10,14 +10,14 @@ services:
- "traefik.enable=True"
- "eu.wiss-ki.barrel.distillery=${DOCKER_NETWORK_NAME}"
- "traefik.http.routers.control.rule=${HOST_RULE}"
- "traefik.http.routers.core_panel.rule=${HOST_RULE}"
- "traefik.http.routers.fallback.rule=HostRegexp(`{catchall:.*}`)"
- "traefik.http.routers.fallback.priority=1"
- "traefik.http.routers.core_fallback.rule=HostRegexp(`{catchall:.*}`)"
- "traefik.http.routers.core_fallback.priority=1"
- "traefik.http.routers.control.tls=${HTTPS_ENABLED}"
- "traefik.http.routers.control.tls.certresolver=distillery"
- "traefik.http.services.control.loadbalancer.server.port=8888"
- "traefik.http.routers.core_panel.tls=${HTTPS_ENABLED}"
- "traefik.http.routers.core_panel.tls.certresolver=distillery"
- "traefik.http.services.core_panel.loadbalancer.server.port=8888"
volumes:

2
internal/dis/component/server/stack.go
View file

@ -25,7 +25,7 @@ func (server *Server) Stack() component.StackWithResources {
EnvContext: map[string]string{
"DOCKER_NETWORK_NAME": server.Config.Docker.Network(),
"HOST_RULE": server.Config.HTTP.DefaultHostRule(),
"HOST_RULE": server.Config.HTTP.PanelHostRule(),
"HTTPS_ENABLED": server.Config.HTTP.HTTPSEnabledEnv(),
"CONFIG_PATH": server.Config.ConfigPath,

2
internal/dis/component/ssh2/server_handler.go
View file

@ -45,7 +45,7 @@ func (ssh2 *SSH2) handleConnection(session ssh.Session) {
{"${SLUG}", slug},
{"${HOSTNAME}", slug + "." + ssh2.Config.HTTP.PrimaryDomain},
{"${DOMAIN}", ssh2.Config.HTTP.PrimaryDomain},
{"${DOMAIN}", ssh2.Config.HTTP.PublicTopDomain()},
{"${PORT}", strconv.FormatUint(uint64(ssh2.Config.Listen.SSHPort), 10)},
{"${HELP_URL}", ssh2.Config.HTTP.JoinPath("user", "ssh").String()},

1
internal/dis/component/ssh2/stack.go
View file

@ -22,7 +22,6 @@ func (ssh *SSH2) Stack() component.StackWithResources {
EnvContext: map[string]string{
"DOCKER_NETWORK_NAME": ssh.Config.Docker.Network(),
"HOST_RULE": ssh.Config.HTTP.DefaultHostRule(),
"CONFIG_PATH": ssh.Config.ConfigPath,
"DEPLOY_ROOT": ssh.Config.Paths.Root,