mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-16 18:42:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix environment variables

Browse Source
This commit is contained in:
David Christofas
2022-04-25 14:21:02 +02:00
parent c29f69d26b
commit 89b925f34a
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.star
View File

@@ -1679,13 +1679,13 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
user = "0:0"
environment = {
"OCIS_URL": "https://ocis-server:9200",
"STORAGE_GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
"GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
"STORAGE_HOME_DRIVER": "%s" % (storage),
"STORAGE_USERS_DRIVER": "%s" % (storage),
"STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root",
"STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users",
"STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata",
"STORAGE_SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json",
"SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json",
"PROXY_ENABLE_BASIC_AUTH": True,
"WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
"IDP_IDENTIFIER_REGISTRATION_CONF": "/drone/src/tests/config/drone/identifier-registration.yml",

2
extensions/auth-basic/pkg/config/config.go
View File

@@ -71,7 +71,7 @@ type LDAPProvider struct {
UserObjectClass string
GroupObjectClass string
LoginAttributes []string
IDP string // TODO what is this for?
IDP string `env:"OCIS_URL;AUTH_BASIC_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema

2
extensions/auth-bearer/pkg/config/config.go
View File

@@ -53,7 +53,7 @@ type AuthProviders struct {
}
type OIDCProvider struct {
Issuer string `yaml:"issuer"`
Issuer string `yaml:"issuer" env:"OCIS_URL;AUTH_BEARER_OIDC_ISSUER"`
Insecure bool `yaml:"insecure"`
IDClaim string `yaml:"id_claim"`
UIDClaim string `yaml:"uid_claim"`

2
extensions/frontend/pkg/config/config.go
View File

@@ -23,7 +23,7 @@ type Config struct {
UploadHTTPMethodOverride string `yaml:"upload_http_method_override"`
DefaultUploadProtocol string `yaml:"default_upload_protocol"`
TransferSecret string `yaml:"transfer_secret"`
PublicURL string
PublicURL string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
Archiver Archiver
AppProvider AppProvider

2
extensions/gateway/pkg/config/config.go
View File

@@ -30,7 +30,7 @@ type Config struct {
PermissionsEndpoint string
SharingEndpoint string
DataGatewayPublicURL string
FrontendPublicURL string
FrontendPublicURL string `env:"OCIS_URL;GATEWAY_FRONTEND_PUBLIC_URL"`
AuthBasicEndpoint string
AuthBearerEndpoint string
AuthMachineEndpoint string

2
extensions/group/pkg/config/config.go
View File

@@ -73,7 +73,7 @@ type LDAPDriver struct {
UserObjectClass string
GroupObjectClass string
LoginAttributes []string
IDP string // TODO what is this for?
IDP string `env:"OCIS_URL;GROUP_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema

2
extensions/ocdav/pkg/config/config.go
View File

@@ -21,7 +21,7 @@ type Config struct {
FilesNamespace string `yaml:"files_namespace"`
SharesNamespace string `yaml:"shares_namespace"`
// PublicURL used to redirect /s/{token} URLs to
PublicURL string `yaml:"public_url"`
PublicURL string `yaml:"public_url" env:"OCIS_URL;OCDAV_PUBLIC_URL"`
// Insecure certificates allowed when making requests to the gateway
Insecure bool `yaml:"insecure" env:"OCIS_INSECURE;OCDAV_INSECURE"`

4
extensions/sharing/pkg/config/config.go
View File

@@ -58,7 +58,7 @@ type UserSharingDrivers struct {
}
type UserSharingJSONDriver struct {
File string
File string `env:"SHARING_USER_JSON_FILE"`
}
type UserSharingSQLDriver struct {
@@ -76,7 +76,7 @@ type UserSharingSQLDriver struct {
type UserSharingCS3Driver struct {
ProviderAddr string
ServiceUserID string
ServiceUserIDP string
ServiceUserIDP string `env:"OCIS_URL;SHARING_CS3_SERVICE_USER_IDP"`
MachineAuthAPIKey string
}

2
extensions/storage-metadata/pkg/config/config.go
View File

@@ -121,7 +121,7 @@ type LocalDriver struct {
type OCISDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root"`
Root string `yaml:"root" env:"STORAGE_METADATA_DRIVER_OCIS_ROOT"`
UserLayout string
PermissionsEndpoint string
}

38
extensions/storage-users/pkg/config/config.go
View File

@@ -21,7 +21,7 @@ type Config struct {
JWTSecret string
GatewayEndpoint string
SkipUserGroupsInToken bool
Driver string `yaml:"driver" env:"STORAGE_METADATA_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"`
Driver string `yaml:"driver" env:"STORAGE_USERS_DRIVER" desc:"The storage driver which should be used by the service"`
Drivers Drivers `yaml:"drivers"`
DataServerURL string
TempFolder string
@@ -32,17 +32,17 @@ type Config struct {
ReadOnly bool
}
type Tracing struct {
Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_METADATA_TRACING_ENABLED" desc:"Activates tracing."`
Type string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_METADATA_TRACING_TYPE"`
Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_METADATA_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_METADATA_TRACING_COLLECTOR"`
Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_USERS_TRACING_ENABLED" desc:"Activates tracing."`
Type string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_USERS_TRACING_TYPE"`
Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_USERS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_USERS_TRACING_COLLECTOR"`
}
type Logging struct {
Level string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_METADATA_LOG_LEVEL" desc:"The log level."`
Pretty bool `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_METADATA_LOG_PRETTY" desc:"Activates pretty log output."`
Color bool `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_METADATA_LOG_COLOR" desc:"Activates colorized log output."`
File string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_METADATA_LOG_FILE" desc:"The target log file."`
Level string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_USERS_LOG_LEVEL" desc:"The log level."`
Pretty bool `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_USERS_LOG_PRETTY" desc:"Activates pretty log output."`
Color bool `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_USERS_LOG_COLOR" desc:"Activates colorized log output."`
File string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_USERS_LOG_FILE" desc:"The target log file."`
}
type Service struct {
@@ -50,20 +50,20 @@ type Service struct {
}
type Debug struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_DEBUG_ADDR"`
Token string `yaml:"token" env:"STORAGE_METADATA_DEBUG_TOKEN"`
Pprof bool `yaml:"pprof" env:"STORAGE_METADATA_DEBUG_PPROF"`
Zpages bool `yaml:"zpages" env:"STORAGE_METADATA_DEBUG_ZPAGES"`
Addr string `yaml:"addr" env:"STORAGE_USERS_DEBUG_ADDR"`
Token string `yaml:"token" env:"STORAGE_USERS_DEBUG_TOKEN"`
Pprof bool `yaml:"pprof" env:"STORAGE_USERS_DEBUG_PPROF"`
Zpages bool `yaml:"zpages" env:"STORAGE_USERS_DEBUG_ZPAGES"`
}
type GRPCConfig struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
Addr string `yaml:"addr" env:"STORAGE_USERS_GRPC_ADDR" desc:"The address of the grpc service."`
Protocol string `yaml:"protocol" env:"STORAGE_USERS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
}
type HTTPConfig struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
Addr string `yaml:"addr" env:"STORAGE_USERS_GRPC_ADDR" desc:"The address of the grpc service."`
Protocol string `yaml:"protocol" env:"STORAGE_USERS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
Prefix string
}
@@ -124,7 +124,7 @@ type EOSDriver struct {
type LocalDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root"`
Root string `yaml:"root" env:"STORAGE_USERS_LOCAL_ROOT"`
//ShareFolder defines the name of the folder jailing all shares
ShareFolder string `yaml:"share_folder"`
UserLayout string
@@ -132,7 +132,7 @@ type LocalDriver struct {
type OCISDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root"`
Root string `yaml:"root" env:"STORAGE_USERS_OCIS_ROOT"`
UserLayout string
PermissionsEndpoint string
// PersonalSpaceAliasTemplate contains the template used to construct

2
extensions/user/pkg/config/config.go
View File

@@ -73,7 +73,7 @@ type LDAPDriver struct {
UserObjectClass string
GroupObjectClass string
LoginAttributes []string
IDP string // TODO what is this for?
IDP string `env:"OCIS_URL;USER_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema