From a8e6a1b1544519add4ac7e44ee975e2e9cd44e90 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Wed, 22 Jan 2025 11:52:53 +0100 Subject: [PATCH] enhancement: the theme is part of opencloud, no need to load it from the core assets anymore --- services/web/pkg/server/http/server.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/services/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go index 3447204ac..25f210b13 100644 --- a/services/web/pkg/server/http/server.go +++ b/services/web/pkg/server/http/server.go @@ -75,18 +75,6 @@ func Server(opts ...Option) (http.Service, error) { fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.ThemesPath), fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/themes"), ) - // OpenCloud is Apache licensed, and the ownCloud branding is AGPLv3. - // we are not allowed to have the ownCloud branding as part of the OpenCloud repository, - // as workaround we layer the embedded core fs on top of the theme fs to provide the ownCloud branding. - // each asset that is part of the embedded core fs (coreFS secondary fs) - // is downloaded at build time from the ownCloud web repository, - // web is licensed under AGPLv3 too, and is allowed to contain the ownCloud branding. - // themeFS = themeFS.Primary (rw) < themeFS.Secondary (ro) < coreFS.Secondary (ro) - // FIXME can we get rid of this layering or do we need it for the fonts? - themeFS = fsx.NewFallbackFS( - themeFS, - fsx.NewBasePathFs(coreFS.Secondary(), "themes"), - ) handle, err := svc.NewService( svc.Logger(options.Logger),