remove supervised flag from configs

This commit is contained in:
Willy Kloucek
2022-01-03 08:22:44 +01:00
parent c9ee77955d
commit 7ffe93ba3b
13 changed files with 13 additions and 25 deletions
+1 -2
View File
@@ -28,8 +28,7 @@ type Config struct {
HashDifficulty int `ocisConfig:"hash_difficulty" env:"ACCOUNTS_HASH_DIFFICULTY"`
DemoUsersAndGroups bool `ocisConfig:"demo_users_and_groups" env:"ACCOUNTS_DEMO_USERS_AND_GROUPS"`
Context context.Context
Supervised bool
Context context.Context
}
// Asset defines the available asset configuration.
+1 -2
View File
@@ -24,8 +24,7 @@ type Config struct {
RoleBundleUUID string `ocisConfig:"role_bundle_uuid" env:"GLAUTH_ROLE_BUNDLE_ID"`
Context context.Context
Supervised bool
Context context.Context
}
// Backend defined the available backend configuration.
+1 -2
View File
@@ -20,8 +20,7 @@ type Config struct {
GraphExplorer GraphExplorer `ocisConfig:"graph_explorer"`
Context context.Context
Supervised bool
Context context.Context
}
// GraphExplorer defines the available graph-explorer configuration.
+1 -2
View File
@@ -24,8 +24,7 @@ type Config struct {
Spaces Spaces `ocisConfig:"spaces"`
Identity Identity `ocisConfig:"identity"`
Context context.Context
Supervised bool
Context context.Context
}
type Spaces struct {
+1 -2
View File
@@ -22,8 +22,7 @@ type Config struct {
IDP Settings `ocisConfig:"idp"`
Ldap Ldap `ocisConfig:"ldap"`
Context context.Context
Supervised bool
Context context.Context
}
// Ldap defines the available LDAP configuration.
+1 -2
View File
@@ -27,8 +27,7 @@ type Config struct {
StorageUsersDriver string `ocisConfig:"storage_users_driver" env:"STORAGE_USERS_DRIVER;OCS_STORAGE_USERS_DRIVER"`
MachineAuthAPIKey string `ocisConfig:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY"`
Context context.Context
Supervised bool
Context context.Context
}
// IdentityManagement keeps track of the OIDC address. This is because Reva requisite of uniqueness for users
+1 -2
View File
@@ -32,8 +32,7 @@ type Config struct {
EnableBasicAuth bool `ocisConfig:"enable_basic_auth" env:"PROXY_ENABLE_BASIC_AUTH"`
InsecureBackends bool `ocisConfig:"insecure_backends" env:"PROXY_INSECURE_BACKENDS"`
Context context.Context
Supervised bool
Context context.Context
}
// Policy enables us to use multiple directors.
+1 -2
View File
@@ -23,8 +23,7 @@ type Config struct {
Asset Asset `ocisConfig:"asset"`
TokenManager TokenManager `ocisConfig:"token_manager"`
Context context.Context
Supervised bool
Context context.Context
}
// Asset defines the available asset configuration.
+1 -1
View File
@@ -125,7 +125,7 @@ type Port struct {
Context context.Context
// Supervised is used when running under an oCIS runtime supervision tree
Supervised bool // deprecated
Supervised bool // deprecated // TODO: delete me
}
// Users defines the available users configuration.
+1 -2
View File
@@ -20,6 +20,5 @@ type Config struct {
Datapath string `ocisConfig:"data_path" env:"STORE_DATA_PATH"`
Context context.Context
Supervised bool
Context context.Context
}
+1 -2
View File
@@ -20,8 +20,7 @@ type Config struct {
Thumbnail Thumbnail `ocisConfig:"thumbnail"`
Context context.Context
Supervised bool
Context context.Context
}
// FileSystemStorage defines the available filesystem storage configuration.
+1 -2
View File
@@ -22,8 +22,7 @@ type Config struct {
File string `ocisConfig:"file" env:"WEB_UI_CONFIG"` // TODO: rename this to a more self explaining string
Web Web `ocisConfig:"web"`
Context context.Context
Supervised bool
Context context.Context
}
// Asset defines the available asset configuration.
+1 -2
View File
@@ -21,6 +21,5 @@ type Config struct {
OcisPublicURL string `ocisConfig:"ocis_public_url" env:"OCIS_URL;OCIS_PUBLIC_URL"`
WebdavNamespace string `ocisConfig:"webdav_namespace" env:"STORAGE_WEBDAV_NAMESPACE"`
Context context.Context
Supervised bool
Context context.Context
}