sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Sql->SQL

Browse Source
This commit is contained in:
André Duffeck
2021-07-05 15:01:43 +02:00
parent 0392dfd18c
commit f7fdda3ee1
8 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/pkg/command/drivers.go
+10 -10
View File
@@ -86,16 +86,16 @@ func drivers(cfg *config.Config) map[string]interface{} {
"userprovidersvc": cfg.Reva.Users.Endpoint, "userprovidersvc": cfg.Reva.Users.Endpoint,
}, },
"owncloudsql": map[string]interface{}{ "owncloudsql": map[string]interface{}{
"datadirectory": cfg.Reva.Storages.OwnCloudSql.Root, "datadirectory": cfg.Reva.Storages.OwnCloudSQL.Root,
"upload_info_dir": cfg.Reva.Storages.OwnCloudSql.UploadInfoDir, "upload_info_dir": cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir,
"sharedirectory": cfg.Reva.Storages.OwnCloudSql.ShareFolder, "sharedirectory": cfg.Reva.Storages.OwnCloudSQL.ShareFolder,
"user_layout": cfg.Reva.Storages.OwnCloudSql.UserLayout, "user_layout": cfg.Reva.Storages.OwnCloudSQL.UserLayout,
"enable_home": cfg.Reva.Storages.OwnCloudSql.EnableHome, "enable_home": cfg.Reva.Storages.OwnCloudSQL.EnableHome,
"dbusername": cfg.Reva.Storages.OwnCloudSql.DBUsername, "dbusername": cfg.Reva.Storages.OwnCloudSQL.DBUsername,
"dbpassword": cfg.Reva.Storages.OwnCloudSql.DBPassword, "dbpassword": cfg.Reva.Storages.OwnCloudSQL.DBPassword,
"dbhost": cfg.Reva.Storages.OwnCloudSql.DBHost, "dbhost": cfg.Reva.Storages.OwnCloudSQL.DBHost,
"dbport": cfg.Reva.Storages.OwnCloudSql.DBPort, "dbport": cfg.Reva.Storages.OwnCloudSQL.DBPort,
"dbname": cfg.Reva.Storages.OwnCloudSql.DBName, "dbname": cfg.Reva.Storages.OwnCloudSQL.DBName,
"userprovidersvc": cfg.Reva.Users.Endpoint, "userprovidersvc": cfg.Reva.Users.Endpoint,
}, },
"ocis": map[string]interface{}{ "ocis": map[string]interface{}{
storage/pkg/command/storagehome.go
+1 -1
View File
@@ -49,7 +49,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
cfg.Reva.Storages.EOS.EnableHome = true cfg.Reva.Storages.EOS.EnableHome = true
cfg.Reva.Storages.Local.EnableHome = true cfg.Reva.Storages.Local.EnableHome = true
cfg.Reva.Storages.OwnCloud.EnableHome = true cfg.Reva.Storages.OwnCloud.EnableHome = true
cfg.Reva.Storages.OwnCloudSql.EnableHome = true cfg.Reva.Storages.OwnCloudSQL.EnableHome = true
cfg.Reva.Storages.S3.EnableHome = true cfg.Reva.Storages.S3.EnableHome = true
cfg.Reva.Storages.S3NG.EnableHome = true cfg.Reva.Storages.S3NG.EnableHome = true
} }
storage/pkg/command/storageusers.go
+1 -1
View File
@@ -49,7 +49,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
cfg.Reva.Storages.EOS.EnableHome = true cfg.Reva.Storages.EOS.EnableHome = true
cfg.Reva.Storages.Local.EnableHome = true cfg.Reva.Storages.Local.EnableHome = true
cfg.Reva.Storages.OwnCloud.EnableHome = true cfg.Reva.Storages.OwnCloud.EnableHome = true
cfg.Reva.Storages.OwnCloudSql.EnableHome = true cfg.Reva.Storages.OwnCloudSQL.EnableHome = true
cfg.Reva.Storages.S3.EnableHome = true cfg.Reva.Storages.S3.EnableHome = true
cfg.Reva.Storages.S3NG.EnableHome = true cfg.Reva.Storages.S3NG.EnableHome = true
} }
storage/pkg/config/config.go
+11 -11
View File
@@ -159,15 +159,15 @@ type PublicStorage struct {
// StorageConfig combines all available storage driver configuration parts. // StorageConfig combines all available storage driver configuration parts.
type StorageConfig struct { type StorageConfig struct {
Home DriverCommon Home DriverCommon
EOS DriverEOS EOS DriverEOS
Local DriverCommon Local DriverCommon
OwnCloud DriverOwnCloud OwnCloud DriverOwnCloud
OwnCloudSql DriverOwnCloudSql OwnCloudSQL DriverOwnCloudSQL
S3 DriverS3 S3 DriverS3
S3NG DriverS3NG S3NG DriverS3NG
Common DriverCommon Common DriverCommon
OCIS DriverOCIS OCIS DriverOCIS
// TODO checksums ... figure out what that is supposed to do // TODO checksums ... figure out what that is supposed to do
} }
@@ -259,8 +259,8 @@ type DriverOwnCloud struct {
Scan bool Scan bool
} }
// DriverOwnCloudSql defines the available ownCloudSql storage driver configuration. // DriverOwnCloudSQL defines the available ownCloudSQL storage driver configuration.
type DriverOwnCloudSql struct { type DriverOwnCloudSQL struct {
DriverCommon DriverCommon
UploadInfoDir string UploadInfoDir string
storage/pkg/flagset/driverowncloudsql.go
+22 -22
View File
@@ -6,78 +6,78 @@ import (
"github.com/owncloud/ocis/storage/pkg/config" "github.com/owncloud/ocis/storage/pkg/config"
) )
// DriverOwnCloudSqlWithConfig applies cfg to the root flagset // DriverOwnCloudSQLWithConfig applies cfg to the root flagset
func DriverOwnCloudSqlWithConfig(cfg *config.Config) []cli.Flag { func DriverOwnCloudSQLWithConfig(cfg *config.Config) []cli.Flag {
return []cli.Flag{ return []cli.Flag{
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-datadir", Name: "storage-owncloudsql-datadir",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.Root, "/var/tmp/ocis/storage/owncloud"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.Root, "/var/tmp/ocis/storage/owncloud"),
Usage: "the path to the owncloudsql data directory", Usage: "the path to the owncloudsql data directory",
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DATADIR"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DATADIR"},
Destination: &cfg.Reva.Storages.OwnCloudSql.Root, Destination: &cfg.Reva.Storages.OwnCloudSQL.Root,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-uploadinfo-dir", Name: "storage-owncloudsql-uploadinfo-dir",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.UploadInfoDir, "/var/tmp/ocis/storage/uploadinfo"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir, "/var/tmp/ocis/storage/uploadinfo"),
Usage: "the path to the tus upload info directory", Usage: "the path to the tus upload info directory",
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR"},
Destination: &cfg.Reva.Storages.OwnCloudSql.UploadInfoDir, Destination: &cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-share-folder", Name: "storage-owncloudsql-share-folder",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.ShareFolder, "/Shares"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.ShareFolder, "/Shares"),
Usage: "name of the shares folder", Usage: "name of the shares folder",
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"},
Destination: &cfg.Reva.Storages.OwnCloudSql.ShareFolder, Destination: &cfg.Reva.Storages.OwnCloudSQL.ShareFolder,
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "storage-owncloudsql-enable-home", Name: "storage-owncloudsql-enable-home",
Value: flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSql.EnableHome, false), Value: flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSQL.EnableHome, false),
Usage: "enable the creation of home storages", Usage: "enable the creation of home storages",
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_ENABLE_HOME"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_ENABLE_HOME"},
Destination: &cfg.Reva.Storages.OwnCloudSql.EnableHome, Destination: &cfg.Reva.Storages.OwnCloudSQL.EnableHome,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-layout", Name: "storage-owncloudsql-layout",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.UserLayout, "{{.Username}}"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.UserLayout, "{{.Username}}"),
Usage: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.Mail}}, {{.Id.OpaqueId}}, {{.Id.Idp}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "Ei/Einstein" `, Usage: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.Mail}}, {{.Id.OpaqueId}}, {{.Id.Idp}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "Ei/Einstein" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_LAYOUT"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_LAYOUT"},
Destination: &cfg.Reva.Storages.OwnCloudSql.UserLayout, Destination: &cfg.Reva.Storages.OwnCloudSQL.UserLayout,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-dbusername", Name: "storage-owncloudsql-dbusername",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBUsername, "owncloud"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBUsername, "owncloud"),
Usage: `"username for accessing the database" `, Usage: `"username for accessing the database" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBUSERNAME"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBUSERNAME"},
Destination: &cfg.Reva.Storages.OwnCloudSql.DBUsername, Destination: &cfg.Reva.Storages.OwnCloudSQL.DBUsername,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-dbpassword", Name: "storage-owncloudsql-dbpassword",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBPassword, "owncloud"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBPassword, "owncloud"),
Usage: `"password for accessing the database" `, Usage: `"password for accessing the database" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPASSWORD"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPASSWORD"},
Destination: &cfg.Reva.Storages.OwnCloudSql.DBPassword, Destination: &cfg.Reva.Storages.OwnCloudSQL.DBPassword,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-dbhost", Name: "storage-owncloudsql-dbhost",
Value: cfg.Reva.Storages.OwnCloudSql.DBHost, Value: cfg.Reva.Storages.OwnCloudSQL.DBHost,
Usage: `"the database hostname or IP address" `, Usage: `"the database hostname or IP address" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBHOST"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBHOST"},
Destination: &cfg.Reva.Storages.OwnCloudSql.DBHost, Destination: &cfg.Reva.Storages.OwnCloudSQL.DBHost,
}, },
&cli.IntFlag{ &cli.IntFlag{
Name: "storage-owncloudsql-dbport", Name: "storage-owncloudsql-dbport",
Value: flags.OverrideDefaultInt(cfg.Reva.Storages.OwnCloudSql.DBPort, 3306), Value: flags.OverrideDefaultInt(cfg.Reva.Storages.OwnCloudSQL.DBPort, 3306),
Usage: `"port the database listens on" `, Usage: `"port the database listens on" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPORT"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPORT"},
Destination: &cfg.Reva.Storages.OwnCloudSql.DBPort, Destination: &cfg.Reva.Storages.OwnCloudSQL.DBPort,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "storage-owncloudsql-dbname", Name: "storage-owncloudsql-dbname",
Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBName, "owncloud"), Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBName, "owncloud"),
Usage: `"the database name" `, Usage: `"the database name" `,
EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBNAME"}, EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBNAME"},
Destination: &cfg.Reva.Storages.OwnCloudSql.DBName, Destination: &cfg.Reva.Storages.OwnCloudSQL.DBName,
}, },
} }
} }
storage/pkg/flagset/storagehome.go
+1 -1
View File
@@ -155,7 +155,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
flags = append(flags, DriverEOSWithConfig(cfg)...) flags = append(flags, DriverEOSWithConfig(cfg)...)
flags = append(flags, DriverLocalWithConfig(cfg)...) flags = append(flags, DriverLocalWithConfig(cfg)...)
flags = append(flags, DriverOwnCloudWithConfig(cfg)...) flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
flags = append(flags, DriverOwnCloudSqlWithConfig(cfg)...) flags = append(flags, DriverOwnCloudSQLWithConfig(cfg)...)
flags = append(flags, DriverOCISWithConfig(cfg)...) flags = append(flags, DriverOCISWithConfig(cfg)...)
flags = append(flags, DriverS3NGWithConfig(cfg)...) flags = append(flags, DriverS3NGWithConfig(cfg)...)
storage/pkg/flagset/storageusers.go
+1 -1
View File
@@ -145,7 +145,7 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag {
flags = append(flags, DriverEOSWithConfig(cfg)...) flags = append(flags, DriverEOSWithConfig(cfg)...)
flags = append(flags, DriverLocalWithConfig(cfg)...) flags = append(flags, DriverLocalWithConfig(cfg)...)
flags = append(flags, DriverOwnCloudWithConfig(cfg)...) flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
flags = append(flags, DriverOwnCloudSqlWithConfig(cfg)...) flags = append(flags, DriverOwnCloudSQLWithConfig(cfg)...)
flags = append(flags, DriverOCISWithConfig(cfg)...) flags = append(flags, DriverOCISWithConfig(cfg)...)
flags = append(flags, DriverS3NGWithConfig(cfg)...) flags = append(flags, DriverS3NGWithConfig(cfg)...)
storage/templates/CONFIGURATION.tmpl
+2 -2
View File
@@ -110,9 +110,9 @@ Example: Set the home and users Storage Provider to `ocis`
{{ template "option" (list .Options "DriverOwnCloudWithConfig") -}} {{ template "option" (list .Options "DriverOwnCloudWithConfig") -}}
### ownCloudSql Driver ### ownCloudSQL Driver
{{ template "option" (list .Options "DriverOwnCloudSqlWithConfig") -}} {{ template "option" (list .Options "DriverOwnCloudSQLWithConfig") -}}
### Ocis Driver ### Ocis Driver