-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2598 from owncloud/fix_metadata_storage
[full-ci] configure users and metadata storage separately
- Loading branch information
Showing
34 changed files
with
1,111 additions
and
605 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
changelog/unreleased/configure-users-metadata-storage-separately.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Change: Configure users and metadata storage separately | ||
|
|
||
| We've fixed the configuration behaviour of the user and metadata service writing in the same | ||
| directory when using oCIS storage. | ||
|
|
||
| Therefore we needed to separate the configuration of the users and metadata storage so that they | ||
| now can be configured totally separate. | ||
|
|
||
| https://github.com/owncloud/ocis/pull/2598 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package storagedrivers | ||
|
|
||
| import ( | ||
| "github.com/owncloud/ocis/storage/pkg/config" | ||
| ) | ||
|
|
||
| func HomeDrivers(cfg *config.Config) map[string]interface{} { | ||
| return map[string]interface{}{ | ||
| "eos": map[string]interface{}{ | ||
| "namespace": cfg.Reva.UserStorage.EOS.Root, | ||
| "shadow_namespace": cfg.Reva.UserStorage.EOS.ShadowNamespace, | ||
| "uploads_namespace": cfg.Reva.UserStorage.EOS.UploadsNamespace, | ||
| "share_folder": cfg.Reva.UserStorage.EOS.ShareFolder, | ||
| "eos_binary": cfg.Reva.UserStorage.EOS.EosBinary, | ||
| "xrdcopy_binary": cfg.Reva.UserStorage.EOS.XrdcopyBinary, | ||
| "master_url": cfg.Reva.UserStorage.EOS.MasterURL, | ||
| "slave_url": cfg.Reva.UserStorage.EOS.SlaveURL, | ||
| "cache_directory": cfg.Reva.UserStorage.EOS.CacheDirectory, | ||
| "sec_protocol": cfg.Reva.UserStorage.EOS.SecProtocol, | ||
| "keytab": cfg.Reva.UserStorage.EOS.Keytab, | ||
| "single_username": cfg.Reva.UserStorage.EOS.SingleUsername, | ||
| "enable_logging": cfg.Reva.UserStorage.EOS.EnableLogging, | ||
| "show_hidden_sys_files": cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles, | ||
| "force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode, | ||
| "use_keytab": cfg.Reva.UserStorage.EOS.UseKeytab, | ||
| "gatewaysvc": cfg.Reva.UserStorage.EOS.GatewaySVC, | ||
| }, | ||
| "eoshome": map[string]interface{}{ | ||
| "namespace": cfg.Reva.UserStorage.EOS.Root, | ||
| "shadow_namespace": cfg.Reva.UserStorage.EOS.ShadowNamespace, | ||
| "uploads_namespace": cfg.Reva.UserStorage.EOS.UploadsNamespace, | ||
| "share_folder": cfg.Reva.UserStorage.EOS.ShareFolder, | ||
| "eos_binary": cfg.Reva.UserStorage.EOS.EosBinary, | ||
| "xrdcopy_binary": cfg.Reva.UserStorage.EOS.XrdcopyBinary, | ||
| "master_url": cfg.Reva.UserStorage.EOS.MasterURL, | ||
| "slave_url": cfg.Reva.UserStorage.EOS.SlaveURL, | ||
| "cache_directory": cfg.Reva.UserStorage.EOS.CacheDirectory, | ||
| "sec_protocol": cfg.Reva.UserStorage.EOS.SecProtocol, | ||
| "keytab": cfg.Reva.UserStorage.EOS.Keytab, | ||
| "single_username": cfg.Reva.UserStorage.EOS.SingleUsername, | ||
| "user_layout": cfg.Reva.UserStorage.EOS.UserLayout, | ||
| "enable_logging": cfg.Reva.UserStorage.EOS.EnableLogging, | ||
| "show_hidden_sys_files": cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles, | ||
| "force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode, | ||
| "use_keytab": cfg.Reva.UserStorage.EOS.UseKeytab, | ||
| "gatewaysvc": cfg.Reva.UserStorage.EOS.GatewaySVC, | ||
| }, | ||
| "eosgrpc": map[string]interface{}{ | ||
| "namespace": cfg.Reva.UserStorage.EOS.Root, | ||
| "shadow_namespace": cfg.Reva.UserStorage.EOS.ShadowNamespace, | ||
| "share_folder": cfg.Reva.UserStorage.EOS.ShareFolder, | ||
| "eos_binary": cfg.Reva.UserStorage.EOS.EosBinary, | ||
| "xrdcopy_binary": cfg.Reva.UserStorage.EOS.XrdcopyBinary, | ||
| "master_url": cfg.Reva.UserStorage.EOS.MasterURL, | ||
| "master_grpc_uri": cfg.Reva.UserStorage.EOS.GrpcURI, | ||
| "slave_url": cfg.Reva.UserStorage.EOS.SlaveURL, | ||
| "cache_directory": cfg.Reva.UserStorage.EOS.CacheDirectory, | ||
| "sec_protocol": cfg.Reva.UserStorage.EOS.SecProtocol, | ||
| "keytab": cfg.Reva.UserStorage.EOS.Keytab, | ||
| "single_username": cfg.Reva.UserStorage.EOS.SingleUsername, | ||
| "user_layout": cfg.Reva.UserStorage.EOS.UserLayout, | ||
| "enable_logging": cfg.Reva.UserStorage.EOS.EnableLogging, | ||
| "show_hidden_sys_files": cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles, | ||
| "force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode, | ||
| "use_keytab": cfg.Reva.UserStorage.EOS.UseKeytab, | ||
| "enable_home": true, | ||
| "gatewaysvc": cfg.Reva.UserStorage.EOS.GatewaySVC, | ||
| }, | ||
| "local": map[string]interface{}{ | ||
| "root": cfg.Reva.UserStorage.Local.Root, | ||
| "share_folder": cfg.Reva.UserStorage.Local.ShareFolder, | ||
| }, | ||
| "localhome": map[string]interface{}{ | ||
| "root": cfg.Reva.UserStorage.Local.Root, | ||
| "share_folder": cfg.Reva.UserStorage.Local.ShareFolder, | ||
| "user_layout": cfg.Reva.UserStorage.Local.UserLayout, | ||
| }, | ||
| "owncloud": map[string]interface{}{ | ||
| "datadirectory": cfg.Reva.UserStorage.OwnCloud.Root, | ||
| "upload_info_dir": cfg.Reva.UserStorage.OwnCloud.UploadInfoDir, | ||
| "share_folder": cfg.Reva.UserStorage.OwnCloud.ShareFolder, | ||
| "user_layout": cfg.Reva.UserStorage.OwnCloud.UserLayout, | ||
| "redis": cfg.Reva.UserStorage.OwnCloud.Redis, | ||
| "enable_home": true, | ||
| "scan": cfg.Reva.UserStorage.OwnCloud.Scan, | ||
| "userprovidersvc": cfg.Reva.Users.Endpoint, | ||
| }, | ||
| "owncloudsql": map[string]interface{}{ | ||
| "datadirectory": cfg.Reva.UserStorage.OwnCloudSQL.Root, | ||
| "upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir, | ||
| "share_folder": cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder, | ||
| "user_layout": cfg.Reva.UserStorage.OwnCloudSQL.UserLayout, | ||
| "enable_home": true, | ||
| "dbusername": cfg.Reva.UserStorage.OwnCloudSQL.DBUsername, | ||
| "dbpassword": cfg.Reva.UserStorage.OwnCloudSQL.DBPassword, | ||
| "dbhost": cfg.Reva.UserStorage.OwnCloudSQL.DBHost, | ||
| "dbport": cfg.Reva.UserStorage.OwnCloudSQL.DBPort, | ||
| "dbname": cfg.Reva.UserStorage.OwnCloudSQL.DBName, | ||
| "userprovidersvc": cfg.Reva.Users.Endpoint, | ||
| }, | ||
| "ocis": map[string]interface{}{ | ||
| "root": cfg.Reva.UserStorage.OCIS.Root, | ||
| "enable_home": true, | ||
| "user_layout": cfg.Reva.UserStorage.OCIS.UserLayout, | ||
| "share_folder": cfg.Reva.UserStorage.OCIS.ShareFolder, | ||
| "treetime_accounting": true, | ||
| "treesize_accounting": true, | ||
| "owner": cfg.Reva.UserStorage.OCIS.ServiceUserUUID, // the accounts service system account uuid | ||
| }, | ||
| "s3": map[string]interface{}{ | ||
| "region": cfg.Reva.UserStorage.S3.Region, | ||
| "access_key": cfg.Reva.UserStorage.S3.AccessKey, | ||
| "secret_key": cfg.Reva.UserStorage.S3.SecretKey, | ||
| "endpoint": cfg.Reva.UserStorage.S3.Endpoint, | ||
| "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, | ||
| }, | ||
| } | ||
| } |
Oops, something went wrong.