From 3c1f43ee51cab09f79471909136080cfd8ae5128 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Tue, 26 Apr 2022 10:46:27 +0200 Subject: [PATCH] add missing environment variables --- .drone.star | 61 +++++++++---------- extensions/auth-machine/pkg/config/config.go | 2 +- extensions/frontend/pkg/config/config.go | 4 +- extensions/gateway/pkg/config/config.go | 2 +- extensions/sharing/pkg/config/config.go | 14 ++--- .../storage-metadata/pkg/config/config.go | 2 +- extensions/storage-users/pkg/config/config.go | 18 +++--- 7 files changed, 51 insertions(+), 52 deletions(-) diff --git a/.drone.star b/.drone.star index e4f1f925e..8b381c809 100644 --- a/.drone.star +++ b/.drone.star @@ -1711,39 +1711,38 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_CLIENT_ID": "ocis-web", "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration", - "STORAGE_OIDC_ISSUER": "https://keycloak", - "STORAGE_LDAP_IDP": "https://keycloak/auth/realms/owncloud", + "AUTH_BEARER_OIDC_ISSUER": "https://keycloak", + "LDAP_IDP": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_SCOPE": "openid profile email owncloud", # LDAP bind - "STORAGE_LDAP_URI": "ldaps://openldap", - "STORAGE_LDAP_INSECURE": "true", - "STORAGE_LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com", - "STORAGE_LDAP_BIND_PASSWORD": "admin", + "LDAP_URI": "ldaps://openldap", + "LDAP_INSECURE": "true", + "LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com", + "LDAP_BIND_PASSWORD": "admin", # LDAP user settings "PROXY_AUTOPROVISION_ACCOUNTS": "true", # automatically create users when they login "PROXY_ACCOUNT_BACKEND_TYPE": "cs3", # proxy should get users from CS3APIS (which gets it from LDAP) "PROXY_USER_OIDC_CLAIM": "ocis.user.uuid", # claim was added in Keycloak "PROXY_USER_CS3_CLAIM": "userid", # equals STORAGE_LDAP_USER_SCHEMA_UID - "STORAGE_LDAP_GROUP_BASE_DN": "ou=testgroups,dc=owncloud,dc=com", - "STORAGE_LDAP_GROUP_OBJECTCLASS": "groupOfUniqueNames", - "STORAGE_LDAP_GROUPFILTER": "(objectclass=owncloud)", - "STORAGE_LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn", - "STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER": "gidnumber", - "STORAGE_LDAP_GROUP_SCHEMA_ID": "cn", - "STORAGE_LDAP_GROUP_SCHEMA_MAIL": "mail", - "STORAGE_LDAP_GROUP_SCHEMA_MEMBER": "cn", - "STORAGE_LDAP_USER_BASE_DN": "ou=testusers,dc=owncloud,dc=com", - "STORAGE_LDAP_USER_OBJECTCLASS": "posixAccount", - "STORAGE_LDAP_USERFILTER": "(objectclass=owncloud)", - "STORAGE_LDAP_USER_SCHEMA_USERNAME": "cn", - "STORAGE_LDAP_USER_SCHEMA_DISPLAYNAME": "displayname", - "STORAGE_LDAP_USER_SCHEMA_GID_NUMBER": "gidnumber", - "STORAGE_LDAP_USER_SCHEMA_MAIL": "mail", - "STORAGE_LDAP_USER_SCHEMA_UID_NUMBER": "uidnumber", - "STORAGE_LDAP_USER_SCHEMA_ID": "ownclouduuid", - "STORAGE_LDAP_LOGIN_ATTRIBUTES": "uid,mail", + "LDAP_GROUP_BASE_DN": "ou=testgroups,dc=owncloud,dc=com", + "LDAP_GROUP_OBJECTCLASS": "groupOfUniqueNames", + "LDAP_GROUPFILTER": "(objectclass=owncloud)", + "LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn", + "LDAP_GROUP_SCHEMA_GID_NUMBER": "gidnumber", + "LDAP_GROUP_SCHEMA_ID": "cn", + "LDAP_GROUP_SCHEMA_MAIL": "mail", + "LDAP_GROUP_SCHEMA_MEMBER": "cn", + "LDAP_USER_BASE_DN": "ou=testusers,dc=owncloud,dc=com", + "LDAP_USER_OBJECTCLASS": "posixAccount", + "LDAP_USERFILTER": "(objectclass=owncloud)", + "LDAP_USER_SCHEMA_USERNAME": "cn", + "LDAP_USER_SCHEMA_DISPLAYNAME": "displayname", + "LDAP_USER_SCHEMA_GID_NUMBER": "gidnumber", + "LDAP_USER_SCHEMA_MAIL": "mail", + "LDAP_USER_SCHEMA_UID_NUMBER": "uidnumber", + "LDAP_USER_SCHEMA_ID": "ownclouduuid", + "LDAP_LOGIN_ATTRIBUTES": "uid,mail", # ownCloudSQL storage driver - "STORAGE_HOME_DRIVER": "owncloudsql", "STORAGE_USERS_DRIVER": "owncloudsql", "STORAGE_METADATA_DRIVER": "ocis", "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR": "/mnt/data/files", @@ -1758,12 +1757,12 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = # TODO: redis is not yet supported "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379", # ownCloudSQL sharing driver - "STORAGE_SHARING_USER_DRIVER": "owncloudsql", - "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud", - "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud", - "STORAGE_SHARING_USER_SQL_HOST": "oc10-db", - "STORAGE_SHARING_USER_SQL_PORT": 3306, - "STORAGE_SHARING_USER_SQL_NAME": "owncloud", + "SHARING_USER_DRIVER": "owncloudsql", + "SHARING_USER_SQL_USERNAME": "owncloud", + "SHARING_USER_SQL_PASSWORD": "owncloud", + "SHARING_USER_SQL_HOST": "oc10-db", + "SHARING_USER_SQL_PORT": 3306, + "SHARING_USER_SQL_NAME": "owncloud", # ownCloud storage readonly # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 "OCIS_STORAGE_READ_ONLY": "false", diff --git a/extensions/auth-machine/pkg/config/config.go b/extensions/auth-machine/pkg/config/config.go index 78c3b6a02..50a2db2c1 100644 --- a/extensions/auth-machine/pkg/config/config.go +++ b/extensions/auth-machine/pkg/config/config.go @@ -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."` } diff --git a/extensions/frontend/pkg/config/config.go b/extensions/frontend/pkg/config/config.go index 9923fa371..fd9d1c99a 100644 --- a/extensions/frontend/pkg/config/config.go +++ b/extensions/frontend/pkg/config/config.go @@ -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 { diff --git a/extensions/gateway/pkg/config/config.go b/extensions/gateway/pkg/config/config.go index 7917f8bca..740fa151f 100644 --- a/extensions/gateway/pkg/config/config.go +++ b/extensions/gateway/pkg/config/config.go @@ -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 diff --git a/extensions/sharing/pkg/config/config.go b/extensions/sharing/pkg/config/config.go index bb164bc71..5302b788b 100644 --- a/extensions/sharing/pkg/config/config.go +++ b/extensions/sharing/pkg/config/config.go @@ -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 { diff --git a/extensions/storage-metadata/pkg/config/config.go b/extensions/storage-metadata/pkg/config/config.go index c569635d8..526a4eabc 100644 --- a/extensions/storage-metadata/pkg/config/config.go +++ b/extensions/storage-metadata/pkg/config/config.go @@ -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 diff --git a/extensions/storage-users/pkg/config/config.go b/extensions/storage-users/pkg/config/config.go index d3f64e2c7..1cbe61634 100644 --- a/extensions/storage-users/pkg/config/config.go +++ b/extensions/storage-users/pkg/config/config.go @@ -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 }