Migrations/neko-rooms
1
0
Fork 0
mirror of https://github.com/m1k1o/neko-rooms.git synced 2026-11-03 07:01:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into custom-labels

Browse Source
This commit is contained in:
Miroslav Šedivý
2022-02-27 21:47:03 +01:00
committed by GitHub
parent 0ae6c2002d 62b7ee7059
commit afe75adcf1
5 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/room.go
+7
View File
@@ -17,6 +17,7 @@ type Room struct {
NAT1To1IPs []string
NekoImages []string
PathPrefix string
Labels []string
StorageEnabled bool
@@ -62,6 +63,11 @@ func (Room) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().String("path_prefix", "", "path prefix that is added to every room path")
if err := viper.BindPFlag("path_prefix", cmd.PersistentFlags().Lookup("path_prefix")); err != nil {
return err
}
cmd.PersistentFlags().StringSlice("labels", []string{}, "additional labels appended to every room")
if err := viper.BindPFlag("labels", cmd.PersistentFlags().Lookup("labels")); err != nil {
return err
@@ -158,6 +164,7 @@ func (s *Room) Set() {
s.NAT1To1IPs = viper.GetStringSlice("nat1to1")
s.NekoImages = viper.GetStringSlice("neko_images")
s.PathPrefix = viper.GetString("path_prefix")
s.Labels = viper.GetStringSlice("labels")
s.StorageEnabled = viper.GetBool("storage.enabled")
internal/http/manager.go
+4 -3
View File
@@ -4,6 +4,7 @@ import (
"context"
"net/http"
"os"
"path"
"github.com/go-chi/chi"
"github.com/go-chi/chi/middleware"
@@ -22,7 +23,7 @@ type HttpManagerCtx struct {
conf *config.Server
}
func New(ApiManager types.ApiManager, conf *config.Server) *HttpManagerCtx {
func New(ApiManager types.ApiManager, pathPrefix string, conf *config.Server) *HttpManagerCtx {
logger := log.With().Str("module", "http").Logger()
router := chi.NewRouter()
@@ -54,8 +55,8 @@ func New(ApiManager types.ApiManager, conf *config.Server) *HttpManagerCtx {
}
// add simple lobby room
router.Get("/{roomName}", ApiManager.RoomLobby)
router.Get("/{roomName}/", ApiManager.RoomLobby)
router.Get(path.Join("/", pathPrefix, "{roomName}"), ApiManager.RoomLobby)
router.Get(path.Join("/", pathPrefix, "{roomName}")+"/", ApiManager.RoomLobby)
router.NotFound(http.HandlerFunc(http.NotFound))
internal/room/manager.go
+13 -12
View File
@@ -149,9 +149,10 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
//
containerName := manager.config.InstanceName + "-" + roomName
pathPrefix := path.Join("/", manager.config.PathPrefix, roomName)
// create traefik rule
traefikRule := "PathPrefix(`/" + roomName + "`)"
traefikRule := "PathPrefix(`" + pathPrefix + "`)"
if manager.config.TraefikDomain != "" && manager.config.TraefikDomain != "*" {
// match *.domain.tld as subdomain
if strings.HasPrefix(manager.config.TraefikDomain, "*.") {
@@ -172,9 +173,9 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
"traefik.http.services." + containerName + "-frontend.loadbalancer.server.port": fmt.Sprintf("%d", frontendPort),
"traefik.http.routers." + containerName + ".entrypoints": manager.config.TraefikEntrypoint,
"traefik.http.routers." + containerName + ".rule": traefikRule,
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": "/" + roomName + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": "/" + roomName + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": "/" + roomName + "/",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": pathPrefix + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": pathPrefix + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": pathPrefix + "/",
"traefik.http.routers." + containerName + ".middlewares": containerName + "-rdr," + containerName + "-prf",
"traefik.http.routers." + containerName + ".service": containerName + "-frontend",
}
@@ -190,7 +191,6 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
//
instanceUrl := manager.config.InstanceUrl
instanceSuffix := roomName + "/"
if instanceUrl == "" {
urlProto := "http"
if manager.config.TraefikCertresolver != "" {
@@ -206,19 +206,20 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
if manager.config.TraefikDomain != "" && manager.config.TraefikDomain != "*" {
// match *.domain.tld as subdomain
if strings.HasPrefix(manager.config.TraefikDomain, "*.") {
instanceUrl = urlProto + "://" + roomName + "." + strings.TrimPrefix(manager.config.TraefikDomain, "*.") + port + "/"
instanceSuffix = ""
instanceUrl = urlProto + "://" + roomName + "." + strings.TrimPrefix(manager.config.TraefikDomain, "*.") + port
pathPrefix = ""
} else {
instanceUrl = urlProto + "://" + manager.config.TraefikDomain + port + "/"
instanceUrl = urlProto + "://" + manager.config.TraefikDomain + port
}
} else {
// domain is not known
instanceUrl = urlProto + "://127.0.0.1" + port + "/"
instanceUrl = urlProto + "://127.0.0.1" + port
}
} else if !strings.HasSuffix(instanceUrl, "/") {
instanceUrl = instanceUrl + "/"
}
// remove last slash
instanceUrl = strings.TrimSuffix(instanceUrl, "/")
var browserPolicyLabels *BrowserPolicyLabels
if settings.BrowserPolicy != nil {
browserPolicyLabels = &BrowserPolicyLabels{
@@ -229,7 +230,7 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
labels := manager.serializeLabels(RoomLabels{
Name: roomName,
URL: instanceUrl + instanceSuffix,
URL: instanceUrl + pathPrefix + "/",
Epr: epr,
NekoImage: settings.NekoImage,