add missing environment variables

This commit is contained in:
David Christofas
2022-04-26 10:46:27 +02:00
parent 5919d256f5
commit 3c1f43ee51
7 changed files with 51 additions and 52 deletions
+1 -1
View File
@@ -53,5 +53,5 @@ type AuthProviders struct {
}
type MachineProvider struct {
APIKey string `yaml:"api_key" env:"AUTH_MACHINE_PROVIDER_API_KEY" desc:"The api key for the machine auth provider."`
APIKey string `yaml:"api_key" env:"OCIS_MACHINE_AUTH_API_KEY;AUTH_MACHINE_PROVIDER_API_KEY" desc:"The api key for the machine auth provider."`
}
+2 -2
View File
@@ -22,7 +22,7 @@ type Config struct {
UploadMaxChunkSize int `yaml:"upload_max_chunk_size"`
UploadHTTPMethodOverride string `yaml:"upload_http_method_override"`
DefaultUploadProtocol string `yaml:"default_upload_protocol"`
TransferSecret string `yaml:"transfer_secret"`
TransferSecret string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"`
PublicURL string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
Archiver Archiver
@@ -121,7 +121,7 @@ type CBOXDriver struct {
}
type AuthMachine struct {
APIKey string
APIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
}
type Checksums struct {
+1 -1
View File
@@ -20,7 +20,7 @@ type Config struct {
CommitShareToStorageRef bool
ShareFolder string
DisableHomeCreationOnLogin bool
TransferSecret string
TransferSecret string `env:"STORAGE_TRANSFER_SECRET"`
TransferExpires int
HomeMapping string
EtagCacheTTL int
+7 -7
View File
@@ -62,11 +62,11 @@ type UserSharingJSONDriver struct {
}
type UserSharingSQLDriver struct {
DBUsername string
DBPassword string
DBHost string
DBPort int
DBName string
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
@@ -77,7 +77,7 @@ type UserSharingCS3Driver struct {
ProviderAddr string
ServiceUserID string
ServiceUserIDP string `env:"OCIS_URL;SHARING_CS3_SERVICE_USER_IDP"`
MachineAuthAPIKey string
MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
}
type PublicSharingDrivers struct {
@@ -106,7 +106,7 @@ type PublicSharingCS3Driver struct {
ProviderAddr string
ServiceUserID string
ServiceUserIDP string
MachineAuthAPIKey string
MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
}
type Events struct {
@@ -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_METADATA_DRIVER" desc:"The driver which should be used by the service"`
Drivers Drivers `yaml:"drivers"`
DataServerURL string
TempFolder string
@@ -177,16 +177,16 @@ type S3NGDriver struct {
type OwnCloudSQLDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root"`
Root string `yaml:"root" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR"`
//ShareFolder defines the name of the folder jailing all shares
ShareFolder string `yaml:"share_folder"`
UserLayout string
UploadInfoDir string `yaml:"upload_info_dir"`
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"`
ShareFolder string `yaml:"share_folder" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"`
UserLayout string `env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT"`
UploadInfoDir string `yaml:"upload_info_dir" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR"`
DBUsername string `yaml:"db_username" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME"`
DBPassword string `yaml:"db_password" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD"`
DBHost string `yaml:"db_host" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST"`
DBPort int `yaml:"db_port" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT"`
DBName string `yaml:"db_name" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME"`
UsersProviderEndpoint string
}