change default paths for oCIS services

This commit is contained in:
Willy Kloucek
2021-10-19 14:37:20 +02:00
parent 75a4015954
commit cddb334f80
54 changed files with 212 additions and 218 deletions
+4 -1
View File
@@ -1,6 +1,9 @@
package flagset
import (
"path"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/ocis-pkg/flags"
"github.com/owncloud/ocis/store/pkg/config"
"github.com/urfave/cli/v2"
@@ -142,7 +145,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "data-path",
Value: flags.OverrideDefaultString(cfg.Datapath, "/var/tmp/ocis/store"),
Value: flags.OverrideDefaultString(cfg.Datapath, path.Join(defaults.BaseDataPath(), "store")),
Usage: "location of the store data path",
EnvVars: []string{"STORE_DATA_PATH"},
Destination: &cfg.Datapath,
+1 -1
View File
@@ -242,7 +242,7 @@ func (s *Service) Tables(ctx context.Context, in *proto.TablesRequest, out *prot
}
// TODO sanitize key. As it may contain invalid characters, such as slashes.
// file: /var/tmp/ocis/store/databases/{database}/{table}/{record.key}.
// file: /tmp/ocis-store/databases/{database}/{table}/{record.key}.
func getID(database string, table string, key string) string {
// TODO sanitize input.
return filepath.Join(database, table, key)