instance labels -> labels.

internal/config/room.go

@@ -17,6 +17,7 @@ type Room struct {
 
 	NAT1To1IPs []string
 	NekoImages []string
+	Labels     []string
 
 	StorageEnabled  bool
 	StorageInternal string
@@ -24,9 +25,8 @@ type Room struct {
 
 	MountsWhitelist []string
 
-	InstanceName   string
-	InstanceUrl    string
-	InstanceLabels []string
+	InstanceName string
+	InstanceUrl  string
 
 	TraefikDomain       string
 	TraefikEntrypoint   string
@@ -62,6 +62,11 @@ func (Room) Init(cmd *cobra.Command) error {
 		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
+	}
+
 	// Data
 
 	cmd.PersistentFlags().Bool("storage.enabled", true, "whether storage is enabled, where peristent containers data will be stored")
@@ -96,11 +101,6 @@ func (Room) Init(cmd *cobra.Command) error {
 		return err
 	}
 
-	cmd.PersistentFlags().StringSlice("instance.labels", []string{}, "additional instance labels appended to a room")
-	if err := viper.BindPFlag("instance.labels", cmd.PersistentFlags().Lookup("instance.labels")); err != nil {
-		return err
-	}
-
 	// Traefik
 
 	cmd.PersistentFlags().String("traefik.domain", "", "traefik: domain on which will be container hosted (if empty or '*', match all; for neko-rooms as subdomain use '*.domain.tld')")
@@ -158,6 +158,7 @@ func (s *Room) Set() {
 
 	s.NAT1To1IPs = viper.GetStringSlice("nat1to1")
 	s.NekoImages = viper.GetStringSlice("neko_images")
+	s.Labels = viper.GetStringSlice("labels")
 
 	s.StorageEnabled = viper.GetBool("storage.enabled")
 	s.StorageInternal = viper.GetString("storage.internal")
@@ -190,7 +191,6 @@ func (s *Room) Set() {
 	}
 
 	s.InstanceUrl = viper.GetString("instance.url")
-	s.InstanceLabels = viper.GetStringSlice("instance.labels")
 
 	s.TraefikDomain = viper.GetString("traefik.domain")
 	s.TraefikEntrypoint = viper.GetString("traefik.entrypoint")

internal/room/manager.go

@@ -239,8 +239,8 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
 		labels[k] = v
 	}
 
-	// add custom instance labels
-	for _, label := range manager.config.InstanceLabels {
+	// add custom labels
+	for _, label := range manager.config.Labels {
 		// replace dynamic values in labels
 		label = strings.Replace(label, "{containerName}", containerName, -1)
 		label = strings.Replace(label, "{roomName}", roomName, -1)
@@ -249,7 +249,7 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
 
 		v := strings.SplitN(label, "=", 2)
 		if len(v) != 2 {
-			manager.logger.Warn().Str("label", label).Msg("invalid instance label")
+			manager.logger.Warn().Str("label", label).Msg("invalid custom label")
 			continue
 		}