diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go index aa7ef42fb..0168fc718 100644 --- a/services/storage-users/pkg/config/config.go +++ b/services/storage-users/pkg/config/config.go @@ -192,6 +192,7 @@ type PosixDriver struct { // Root is the absolute path to the location of the data Root string `yaml:"root" env:"STORAGE_USERS_POSIX_ROOT" desc:"The directory where the filesystem storage will store its data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/owncloud."` UserLayout string `yaml:"user_layout" env:"STORAGE_USERS_POSIX_USER_LAYOUT" desc:"Template string for the user storage layout in the user directory."` + ProjectLayout string `yaml:"project_layout" env:"STORAGE_USERS_POSIX_PROJECT_LAYOUT" desc:"Template string for the project spaces storage layout."` PermissionsEndpoint string `yaml:"permissions_endpoint" env:"STORAGE_USERS_PERMISSION_ENDPOINT;STORAGE_USERS_POSIX_PERMISSIONS_ENDPOINT" desc:"Endpoint of the permissions service. The endpoints can differ for 'ocis', 'posix' and 's3ng'."` } diff --git a/services/storage-users/pkg/config/defaults/defaultconfig.go b/services/storage-users/pkg/config/defaults/defaultconfig.go index 07eea0f1e..04017bc61 100644 --- a/services/storage-users/pkg/config/defaults/defaultconfig.go +++ b/services/storage-users/pkg/config/defaults/defaultconfig.go @@ -139,6 +139,7 @@ func DefaultConfig() *config.Config { }, Posix: config.PosixDriver{ UserLayout: "users/{{.User.Username}}", + ProjectLayout: "projects/{{.SpaceId}}", PermissionsEndpoint: "com.owncloud.api.settings", }, }, diff --git a/services/storage-users/pkg/revaconfig/drivers.go b/services/storage-users/pkg/revaconfig/drivers.go index e51016961..03a045f1a 100644 --- a/services/storage-users/pkg/revaconfig/drivers.go +++ b/services/storage-users/pkg/revaconfig/drivers.go @@ -89,6 +89,7 @@ func Posix(cfg *config.Config) map[string]interface{} { return map[string]interface{}{ "root": cfg.Drivers.Posix.Root, "user_layout": cfg.Drivers.Posix.UserLayout, + "project_layout": cfg.Drivers.Posix.ProjectLayout, "permissionssvc": cfg.Drivers.Posix.PermissionsEndpoint, "permissionssvc_tls_mode": cfg.Commons.GRPCClientTLS.Mode, "treetime_accounting": true,