mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-06 19:40:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

sharing config docs

Browse Source
This commit is contained in:
Willy Kloucek
2022-05-03 13:25:36 +02:00
parent dde2d41831
commit c6af86c2a8
2 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/sharing/pkg/config/config.go
+39 -39
View File
@@ -17,14 +17,14 @@ type Config struct {
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
Events Events `yaml:"events"`
SkipUserGroupsInToken bool `yaml:"-"`
UserSharingDriver string `yaml:"user_sharing_driver"`
UserSharingDriver string `yaml:"user_sharing_driver" env:"SHARING_USER_DRIVER"`
UserSharingDrivers UserSharingDrivers `yaml:"user_sharin_drivers"`
PublicSharingDriver string `yaml:"public_sharing_driver"`
PublicSharingDriver string `yaml:"public_sharing_driver" env:"SHARING_PUBLIC_DRIVER"`
PublicSharingDrivers PublicSharingDrivers `yaml:"public_sharing_drivers"`
Events Events `yaml:"events"`
Supervised bool `yaml:"-"`
Context context.Context `yaml:"-"`
@@ -61,64 +61,64 @@ type GRPCConfig struct {
}
type UserSharingDrivers struct {
JSON UserSharingJSONDriver
SQL UserSharingSQLDriver
CS3 UserSharingCS3Driver
JSON UserSharingJSONDriver `yaml:"json"`
CS3 UserSharingCS3Driver `yaml:"cs3"`
SQL UserSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs
}
type UserSharingJSONDriver struct {
File string `env:"SHARING_USER_JSON_FILE"`
File string `yaml:"file" env:"SHARING_USER_JSON_FILE"`
}
type UserSharingSQLDriver struct {
DBUsername string `env:"SHARING_USER_SQL_USERNAME"`
DBPassword string `env:"SHARING_USER_SQL_PASSWORD"`
DBHost string `env:"SHARING_USER_SQL_HOST"`
DBPort int `env:"SHARING_USER_SQL_PORT"`
DBName string `env:"SHARING_USER_SQL_NAME"`
PasswordHashCost int
EnableExpiredSharesCleanup bool
JanitorRunInterval int
UserStorageMountID string
DBUsername string `yaml:"db_username"`
DBPassword string `yaml:"db_password"`
DBHost string `yaml:"db_host"`
DBPort int `yaml:"db_port"`
DBName string `yaml:"db_name"`
PasswordHashCost int `yaml:"password_hash_cost"`
EnableExpiredSharesCleanup bool `yaml:"enable_expired_shares_cleanup"`
JanitorRunInterval int `yaml:"janitor_run_interval"`
UserStorageMountID string `yaml:"user_storage_mount_id"`
}
type UserSharingCS3Driver struct {
ProviderAddr string
ServiceUserID string
ServiceUserIDP string `env:"OCIS_URL;SHARING_CS3_SERVICE_USER_IDP"`
MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
ProviderAddr string `yaml:"provider_addr" env:"SHARING_USER_CS3_PROVIDER_ADDR"`
ServiceUserID string `yaml:"service_user_id" env:"SHARING_USER_CS3_SERVICE_USER_ID"`
ServiceUserIDP string `yaml:"service_user_idp" env:"OCIS_URL;SHARING_USER_CS3_SERVICE_USER_IDP"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SHARING_USER_CS3_MACHINE_AUTH_API_KEY"`
}
type PublicSharingDrivers struct {
JSON PublicSharingJSONDriver
SQL PublicSharingSQLDriver
CS3 PublicSharingCS3Driver
JSON PublicSharingJSONDriver `yaml:"json"`
CS3 PublicSharingCS3Driver `yaml:"cs3"`
SQL PublicSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs
}
type PublicSharingJSONDriver struct {
File string
File string `yaml:"file" env:"SHARING_PUBLIC_JSON_FILE"`
}
type PublicSharingSQLDriver struct {
DBUsername string
DBPassword string
DBHost string
DBPort int
DBName string
PasswordHashCost int
EnableExpiredSharesCleanup bool
JanitorRunInterval int
UserStorageMountID string
DBUsername string `yaml:"db_username"`
DBPassword string `yaml:"db_password"`
DBHost string `yaml:"db_host"`
DBPort int `yaml:"db_port"`
DBName string `yaml:"db_name"`
PasswordHashCost int `yaml:"password_hash_cost"`
EnableExpiredSharesCleanup bool `yaml:"enable_expired_shares_cleanup"`
JanitorRunInterval int `yaml:"janitor_run_interval"`
UserStorageMountID string `yaml:"user_storage_mount_id"`
}
type PublicSharingCS3Driver struct {
ProviderAddr string
ServiceUserID string
ServiceUserIDP string
MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
ProviderAddr string `yaml:"provider_addr" env:"SHARING_PUBLIC_CS3_PROVIDER_ADDR"`
ServiceUserID string `yaml:"service_user_id" env:"SHARING_PUBLIC_CS3_SERVICE_USER_ID"`
ServiceUserIDP string `yaml:"service_user_idp" env:"OCIS_URL;SHARING_PUBLIC_CS3_SERVICE_USER_IDP"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SHARING_PUBLIC_CS3_MACHINE_AUTH_API_KEY"`
}
type Events struct {
Addr string
ClusterID string
Addr string `yaml:"addr" env:"SHARING_EVENTS_ADDR"`
ClusterID string `yaml:"cluster_id" env:"SHARING_EVENTS_CLUSTER_ID"`
}
extensions/sharing/pkg/config/defaults/defaultconfig.go
+2 -22
View File
@@ -33,41 +33,21 @@ func DefaultConfig() *config.Config {
Reva: &config.Reva{
Address: "127.0.0.1:9142",
},
UserSharingDriver: "json",
UserSharingDriver: "cs3",
UserSharingDrivers: config.UserSharingDrivers{
JSON: config.UserSharingJSONDriver{
File: filepath.Join(defaults.BaseDataPath(), "storage", "shares.json"),
},
SQL: config.UserSharingSQLDriver{
DBUsername: "",
DBPassword: "",
DBHost: "",
DBPort: 1433,
DBName: "",
PasswordHashCost: 11,
EnableExpiredSharesCleanup: true,
JanitorRunInterval: 60,
},
CS3: config.UserSharingCS3Driver{
ProviderAddr: "127.0.0.1:9215", // metadata storage
ServiceUserIDP: "internal",
},
},
PublicSharingDriver: "json",
PublicSharingDriver: "cs3",
PublicSharingDrivers: config.PublicSharingDrivers{
JSON: config.PublicSharingJSONDriver{
File: filepath.Join(defaults.BaseDataPath(), "storage", "publicshares.json"),
},
SQL: config.PublicSharingSQLDriver{
DBUsername: "",
DBPassword: "",
DBHost: "",
DBPort: 1433,
DBName: "",
PasswordHashCost: 11,
EnableExpiredSharesCleanup: true,
JanitorRunInterval: 60,
},
CS3: config.PublicSharingCS3Driver{
ProviderAddr: "127.0.0.1:9215", // metadata storage
ServiceUserIDP: "internal",