update reva config

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

Makefile

@@ -250,12 +250,12 @@ eos-ocis-storage-home:
 	# configure the home storage to use the eos driver and return the mount id of the eos driver in responses
 	docker exec -i \
 	--env OCIS_LOG_LEVEL=debug \
-	--env REVA_STORAGE_HOME_DRIVER=eos \
+	--env REVA_STORAGE_HOME_DRIVER=eoshome \
-	--env REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 \
+	--env REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009154 \
 	eos-cli1 ocis reva-storage-home &
 	docker exec -i \
 	--env OCIS_LOG_LEVEL=debug \
-	--env REVA_STORAGE_HOME_DATA_DRIVER=eos \
+	--env REVA_STORAGE_HOME_DATA_DRIVER=eoshome \
 	eos-cli1 ocis reva-storage-home-data &
 	docker exec -i \
 	--env OCIS_LOG_LEVEL=debug \
@@ -279,6 +279,7 @@ eos-ocis:
 	bin/ocis reva-auth-basic & \
 	bin/ocis reva-auth-bearer & \
 	bin/ocis reva-frontend & \
+	bin/ocis reva-storage-public-link & \
 	bin/ocis reva-gateway & \
 	bin/ocis reva-sharing & \
 	bin/ocis reva-users & \
@@ -296,3 +297,8 @@ eos-clean:
 eos-stop: eos-docker
 	./eos-docker/scripts/shutdown_services.sh
 
+.PHONY: eos-install-go
+eos-install-go:
+	docker exec -i eos-cli1 curl https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz -O
+	docker exec -i eos-cli1 tar -C /usr/local -xzf go1.14.4.linux-amd64.tar.gz
+	# export PATH=$PATH:/usr/local/go/bin

pkg/command/revastoragepubliclink.go

@@ -11,21 +11,25 @@ import (
 	"github.com/owncloud/ocis/pkg/register"
 )
 
-// RevaPublicLinkStorage is the entry point for the proxy command.
+// RevaStoragePublicLinkCommand is the entrypoint for the reva-storage-oc command.
-func RevaPublicLinkStorage(cfg *config.Config) *cli.Command {
+func RevaStoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     "reva-storage-public-link",
-		Usage:    "Start public link storage driver",
+		Usage:    "Start reva public link storage",
 		Category: "Extensions",
 		Flags:    flagset.StoragePublicLink(cfg.Reva),
-		Action: func(ctx *cli.Context) error {
+		Action: func(c *cli.Context) error {
-			publicStorageCmd := command.StoragePublicLink(configurePublicStorage(cfg))
+			scfg := configureRevaStoragePublicLink(cfg)
-			return cli.HandleAction(publicStorageCmd.Action, ctx)
+
+			return cli.HandleAction(
+				command.StoragePublicLink(scfg).Action,
+				c,
+			)
 		},
 	}
 }
 
-func configurePublicStorage(cfg *config.Config) *svcconfig.Config {
+func configureRevaStoragePublicLink(cfg *config.Config) *svcconfig.Config {
 	cfg.Reva.Log.Level = cfg.Log.Level
 	cfg.Reva.Log.Pretty = cfg.Log.Pretty
 	cfg.Reva.Log.Color = cfg.Log.Color
@@ -34,5 +38,5 @@ func configurePublicStorage(cfg *config.Config) *svcconfig.Config {
 }
 
 func init() {
-	register.AddCommand(RevaPublicLinkStorage)
+	register.AddCommand(RevaStorageOCCommand)
 }

pkg/runtime/runtime.go

@@ -41,14 +41,13 @@ var (
 		"reva-users",
 		"reva-auth-basic",
 		"reva-auth-bearer",
-		// "reva-storage-root",
 		"reva-storage-home",
-		"reva-storage-public-link",
 		"reva-storage-home-data",
 		"reva-storage-eos",
 		"reva-storage-eos-data",
 		"reva-storage-oc",
 		"reva-storage-oc-data",
+		"reva-storage-public-link",
 		"accounts",
 		"glauth",
 		"konnectd",