diff --git a/extensions/auth-basic/pkg/config/config.go b/extensions/auth-basic/pkg/config/config.go index 2632ac9b1..162903407 100644 --- a/extensions/auth-basic/pkg/config/config.go +++ b/extensions/auth-basic/pkg/config/config.go @@ -50,7 +50,7 @@ type GRPCConfig struct { } type AuthProviders struct { - JSON JSONProvider `yaml:"json"` + JSON JSONProvider `yaml:"json"` // not supported by the oCIS product, therefore not part of docs LDAP LDAPProvider `yaml:"ldap"` OwnCloudSQL OwnCloudSQLProvider `yaml:"owncloud_sql"` } diff --git a/extensions/group/pkg/config/config.go b/extensions/group/pkg/config/config.go index 415db0255..ceece5545 100644 --- a/extensions/group/pkg/config/config.go +++ b/extensions/group/pkg/config/config.go @@ -51,10 +51,10 @@ type GRPCConfig struct { } type Drivers struct { - JSON JSONDriver + JSON JSONDriver // not supported by the oCIS product, therefore not part of docs LDAP LDAPDriver OwnCloudSQL OwnCloudSQLDriver - REST RESTProvider + REST RESTProvider // not supported by the oCIS product, therefore not part of docs } type JSONDriver struct { diff --git a/extensions/storage-users/pkg/config/config.go b/extensions/storage-users/pkg/config/config.go index 7cb288814..e47bd0179 100644 --- a/extensions/storage-users/pkg/config/config.go +++ b/extensions/storage-users/pkg/config/config.go @@ -70,10 +70,10 @@ type HTTPConfig struct { } type Drivers struct { - EOS EOSDriver - Local LocalDriver + EOS EOSDriver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs + Local LocalDriver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs OCIS OCISDriver - S3 S3Driver + S3 S3Driver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs S3NG S3NGDriver OwnCloudSQL OwnCloudSQLDriver } diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/extensions/storage-users/pkg/config/defaults/defaultconfig.go index b29e9daa9..87c0bb4cd 100644 --- a/extensions/storage-users/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-users/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,6 @@ package defaults import ( - "os" "path/filepath" "github.com/owncloud/ocis/extensions/storage-users/pkg/config" @@ -43,25 +42,6 @@ func DefaultConfig() *config.Config { MountID: "1284d238-aa92-42ce-bdc4-0b0000009157", Driver: "ocis", Drivers: config.Drivers{ - EOS: config.EOSDriver{ - Root: "/eos/dockertest/reva", - ShareFolder: "/Shares", - UserLayout: "{{substr 0 1 .Username}}/{{.Username}}", - ShadowNamespace: "", - UploadsNamespace: "", - EosBinary: "/usr/bin/eos", - XrdcopyBinary: "/usr/bin/xrdcopy", - MasterURL: "root://eos-mgm1.eoscluster.cern.ch:1094", - GRPCURI: "", - SlaveURL: "root://eos-mgm1.eoscluster.cern.ch:1094", - CacheDirectory: os.TempDir(), - GatewaySVC: "127.0.0.1:9142", - }, - Local: config.LocalDriver{ - Root: filepath.Join(defaults.BaseDataPath(), "storage", "local", "users"), - ShareFolder: "/Shares", - UserLayout: "{{.Username}}", - }, OwnCloudSQL: config.OwnCloudSQLDriver{ Root: filepath.Join(defaults.BaseDataPath(), "storage", "owncloud"), ShareFolder: "/Shares", @@ -73,9 +53,6 @@ func DefaultConfig() *config.Config { DBPort: 3306, DBName: "owncloud", }, - S3: config.S3Driver{ - Region: "default", - }, S3NG: config.S3NGDriver{ Root: filepath.Join(defaults.BaseDataPath(), "storage", "users"), ShareFolder: "/Shares", diff --git a/extensions/user/pkg/config/config.go b/extensions/user/pkg/config/config.go index 41cc0ab6e..8a2272438 100644 --- a/extensions/user/pkg/config/config.go +++ b/extensions/user/pkg/config/config.go @@ -51,10 +51,10 @@ type GRPCConfig struct { } type Drivers struct { - JSON JSONDriver + JSON JSONDriver // not supported by the oCIS product, therefore not part of docs LDAP LDAPDriver OwnCloudSQL OwnCloudSQLDriver - REST RESTProvider + REST RESTProvider // not supported by the oCIS product, therefore not part of docs } type JSONDriver struct {