diff --git a/storage/pkg/command/storagedrivers/home.go b/storage/pkg/command/storagedrivers/home.go index ccac2f85d1..1f41bdb126 100644 --- a/storage/pkg/command/storagedrivers/home.go +++ b/storage/pkg/command/storagedrivers/home.go @@ -115,15 +115,18 @@ func HomeDrivers(cfg *config.Config) map[string]interface{} { "bucket": cfg.Reva.UserStorage.S3.Bucket, }, "s3ng": map[string]interface{}{ - "root": cfg.Reva.UserStorage.S3NG.Root, - "enable_home": true, - "user_layout": cfg.Reva.UserStorage.S3NG.UserLayout, - "share_folder": cfg.Reva.UserStorage.S3NG.ShareFolder, - "s3.region": cfg.Reva.UserStorage.S3NG.Region, - "s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey, - "s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey, - "s3.endpoint": cfg.Reva.UserStorage.S3NG.Endpoint, - "s3.bucket": cfg.Reva.UserStorage.S3NG.Bucket, + "root": cfg.Reva.UserStorage.S3NG.Root, + "enable_home": true, + "user_layout": cfg.Reva.UserStorage.S3NG.UserLayout, + "treetime_accounting": true, + "treesize_accounting": true, + "owner": cfg.Reva.UserStorage.S3NG.ServiceUserUUID, // the accounts service system account uuid + "share_folder": cfg.Reva.UserStorage.S3NG.ShareFolder, + "s3.region": cfg.Reva.UserStorage.S3NG.Region, + "s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey, + "s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey, + "s3.endpoint": cfg.Reva.UserStorage.S3NG.Endpoint, + "s3.bucket": cfg.Reva.UserStorage.S3NG.Bucket, }, } } diff --git a/storage/pkg/command/storagedrivers/user.go b/storage/pkg/command/storagedrivers/user.go index 9fe3f8b982..84fdcb9533 100644 --- a/storage/pkg/command/storagedrivers/user.go +++ b/storage/pkg/command/storagedrivers/user.go @@ -117,15 +117,18 @@ func UserDrivers(cfg *config.Config) map[string]interface{} { "prefix": cfg.Reva.UserStorage.S3.Root, }, "s3ng": map[string]interface{}{ - "root": cfg.Reva.UserStorage.S3NG.Root, - "enable_home": false, - "user_layout": cfg.Reva.UserStorage.S3NG.UserLayout, - "share_folder": cfg.Reva.UserStorage.S3NG.ShareFolder, - "s3.region": cfg.Reva.UserStorage.S3NG.Region, - "s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey, - "s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey, - "s3.endpoint": cfg.Reva.UserStorage.S3NG.Endpoint, - "s3.bucket": cfg.Reva.UserStorage.S3NG.Bucket, + "root": cfg.Reva.UserStorage.S3NG.Root, + "enable_home": false, + "user_layout": cfg.Reva.UserStorage.S3NG.UserLayout, + "share_folder": cfg.Reva.UserStorage.S3NG.ShareFolder, + "treetime_accounting": true, + "treesize_accounting": true, + "owner": cfg.Reva.UserStorage.S3NG.ServiceUserUUID, // the accounts service system account uuid + "s3.region": cfg.Reva.UserStorage.S3NG.Region, + "s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey, + "s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey, + "s3.endpoint": cfg.Reva.UserStorage.S3NG.Endpoint, + "s3.bucket": cfg.Reva.UserStorage.S3NG.Bucket, }, } } diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 43c57b21c6..09746d9944 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -2093,6 +2093,10 @@ func structMappings(cfg *Config) []shared.EnvBinding { EnvVars: []string{"STORAGE_USERS_DRIVER_S3NG_LAYOUT"}, Destination: &cfg.Reva.UserStorage.S3NG.UserLayout, }, + { + EnvVars: []string{"STORAGE_USERS_DRIVER_S3NG_SERVICE_USER_UUID"}, + Destination: &cfg.Reva.UserStorage.S3NG.ServiceUserUUID, + }, { EnvVars: []string{"STORAGE_USERS_DRIVER_S3NG_SHARE_FOLDER"}, Destination: &cfg.Reva.UserStorage.S3NG.ShareFolder,