sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 from opencloud-eu/remove-core-theme-fs

Browse Source 
enhancement: remove core assets theme fs
This commit is contained in:
Andre Duffeck
2025-01-22 14:17:36 +01:00
committed by GitHub
parent ee98b65877 a8e6a1b154
commit 95e908f3b0
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/pkg/server/http/server.go
-12
View File
@@ -75,18 +75,6 @@ func Server(opts ...Option) (http.Service, error) {
fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.ThemesPath), fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.ThemesPath),
fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/themes"), 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( handle, err := svc.NewService(
svc.Logger(options.Logger), svc.Logger(options.Logger),