Merge pull request #2043 from fschade/issue-2009-run-single-service

Remove sub-service binary entrypoints and fix antivirus only server cmd

opencloud/pkg/command/services.go

@@ -61,7 +61,7 @@ var serviceCommands = []register.Command{
 	},
 	func(cfg *config.Config) *cobra.Command {
 		return ServiceCommand(cfg, cfg.Antivirus.Service.Name, antivirus.GetCommands(cfg.Antivirus), func(c *config.Config) {
-			// cfg.Antivirus.Commons = cfg.Commons // antivirus needs no commons atm
+			cfg.Antivirus.Commons = cfg.Commons
 		})
 	},
 	func(cfg *config.Config) *cobra.Command {

services/activitylog/cmd/activitylog/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/antivirus/cmd/antivirus/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/app-provider/cmd/app-provider/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/app-registry/cmd/app-registry/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/app-registry/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/audit/cmd/audit/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/audit/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/auth-app/cmd/auth-app/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/auth-app/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/auth-basic/cmd/auth-basic/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/auth-bearer/cmd/auth-bearer/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/auth-machine/cmd/auth-machine/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/auth-service/cmd/auth-service/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/auth-service/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/clientlog/cmd/clientlog/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/clientlog/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/collaboration/cmd/collaboration/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/eventhistory/cmd/eventhistory/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/frontend/cmd/frontend/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/frontend/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/gateway/cmd/gateway/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/gateway/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/graph/cmd/graph/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/graph/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/groups/cmd/groups/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/groups/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/idm/cmd/idm/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/idm/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/idp/cmd/idp/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/idp/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/invitations/cmd/invitations/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/invitations/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/nats/cmd/nats/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/nats/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/notifications/cmd/notifications/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/ocdav/cmd/ocdav/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/ocdav/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/ocm/cmd/ocm/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/ocm/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/ocs/cmd/ocs/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/ocs/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/policies/cmd/policies/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/policies/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/postprocessing/cmd/postprocessing/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/proxy/cmd/proxy/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/proxy/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/search/cmd/search/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/search/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/settings/cmd/settings/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/settings/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/sharing/cmd/sharing/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/sharing/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/sse/cmd/sse/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/sse/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/storage-publiclink/cmd/storage-publiclink/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/storage-shares/cmd/storage-shares/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/storage-system/cmd/storage-system/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/storage-system/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/storage-users/cmd/storage-users/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/storage-users/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/thumbnails/cmd/thumbnails/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/thumbnails/pkg/preprocessor/preprocessor.go

@@ -20,6 +20,7 @@ import (
 	"golang.org/x/image/math/fixed"
 
 	"github.com/dhowden/tag"
+
 	thumbnailerErrors "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors"
 )
 
@@ -156,15 +157,18 @@ Scan: // Label for the scanner loop, so we can break it easily
 				if canvas.Dot.Y > maxY {
 					break Scan
 				}
-				drawWord(canvas, textResult.Text[initialByte:sRangeSpace], minX, maxX, height, maxY, true)
+
+				drawWord(canvas, textResult.Text[initialByte:sRangeSpace], minX, maxX, height, maxY)
 				initialByte = sRangeSpace
 			}
+
 			if initialByte <= sRange.High {
 				// some bytes left to be written
 				if canvas.Dot.Y > maxY {
 					break Scan
 				}
-				drawWord(canvas, textResult.Text[initialByte:sRange.High+1], minX, maxX, height, maxY, len(sRange.Spaces) > 0)
+
+				drawWord(canvas, textResult.Text[initialByte:sRange.High+1], minX, maxX, height, maxY)
 			}
 		}
 
@@ -235,43 +239,58 @@ func extractBase64ImageFromGGP(ggp *GGPStruct) (string, error) {
 // need to draw the word in a new line
 //
 // Note that the word will likely start with a white space char
-func drawWord(canvas *font.Drawer, word string, minX, maxX, incY, maxY fixed.Int26_6, goToNewLine bool) {
-	bbox, _ := canvas.BoundString(word)
-	if bbox.Max.X <= maxX {
-		// word fits in the current line
-		canvas.DrawString(word)
-	} else {
-		// word doesn't fit -> retry in a new line
-		trimmedWord := strings.TrimSpace(word)
-		oldDot := canvas.Dot
+func drawWord(canvas *font.Drawer, word string, minX, maxX, incY, maxY fixed.Int26_6) {
+	// calculate the actual measurement of the string at a given X position
+	measure := func(s string, dotX fixed.Int26_6) (min, max fixed.Int26_6) {
+		bbox, _ := canvas.BoundString(s)
+		return dotX + bbox.Min.X, dotX + bbox.Max.X
+	}
 
-		canvas.Dot.X = minX
-		canvas.Dot.Y += incY
-		bbox2, _ := canvas.BoundString(trimmedWord)
-		if goToNewLine && bbox2.Max.X <= maxX {
-			if canvas.Dot.Y > maxY {
-				// Don't draw if we're over the Y limit
-				return
-			}
-			canvas.DrawString(trimmedWord)
-		} else {
-			// word doesn't fit in a new line -> draw as many chars as possible
-			canvas.Dot = oldDot
-			for _, char := range trimmedWord {
-				charBytes := []byte(string(char))
-				bbox3, _ := canvas.BoundBytes(charBytes)
-				if bbox3.Max.X > maxX {
-					canvas.Dot.X = minX
-					canvas.Dot.Y += incY
-					if canvas.Dot.Y > maxY {
-						// Don't draw if we're over the Y limit
-						return
-					}
-				}
-				canvas.DrawBytes(charBytes)
-			}
+	// first try to draw the whole word
+	absMin, absMax := measure(word, canvas.Dot.X)
+	if absMin >= minX && absMax <= maxX {
+		canvas.DrawString(word)
+		return
+	}
+
+	// try to draw the trimmed word in a new line
+	trimmed := strings.TrimSpace(word)
+	oldDot := canvas.Dot
+	canvas.Dot.X = minX
+	canvas.Dot.Y += incY
+
+	if canvas.Dot.Y <= maxY {
+		tMin, tMax := measure(trimmed, canvas.Dot.X)
+		if tMin >= minX && tMax <= maxX {
+			canvas.DrawString(trimmed)
+			return
 		}
 	}
+
+	// if the trimmed word is still too big, draw it char by char
+	canvas.Dot = oldDot
+	for _, char := range trimmed {
+		s := string(char)
+		_, cMax := measure(s, canvas.Dot.X)
+
+		if cMax > maxX {
+			canvas.Dot.X = minX
+			canvas.Dot.Y += incY
+		}
+
+		// stop drawing if we exceed maxY
+		if canvas.Dot.Y > maxY {
+			return
+		}
+
+		// ensure that we don't start drawing before minX
+		cMin, _ := measure(s, canvas.Dot.X)
+		if cMin < minX {
+			canvas.Dot.X += minX - cMin
+		}
+
+		canvas.DrawString(s)
+	}
 }
 
 // ForType returns the converter for the specified mimeType

services/userlog/cmd/userlog/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/userlog/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/users/cmd/users/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/users/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/web/cmd/web/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/web/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/web/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/webdav/cmd/webdav/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/webdav/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/webfinger/cmd/webfinger/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/opencloud-eu/opencloud/services/webfinger/pkg/command"
-	"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}