From dd4c32037751a027148d53a646fbb09888bfa1f0 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Thu, 15 Oct 2020 13:54:12 +0200
Subject: [PATCH] change ocis log level to default and change public link
 storage mountid mapping

Signed-off-by: David Christofas <dchristofas@owncloud.com>
---
 .drone.star                        | 2 +-
 storage/pkg/command/gateway.go     | 2 ++
 storage/pkg/flagset/gateway.go     | 8 ++++++++
 storage/pkg/flagset/storagehome.go | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.drone.star b/.drone.star
index 25583717e..9972c4c4b 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1402,7 +1402,7 @@ def ocisServer(storage):
       'pull': 'always',
       'detach': True,
       'environment' : {
-        'OCIS_LOG_LEVEL': 'debug',
+        #'OCIS_LOG_LEVEL': 'debug',
         'STORAGE_HOME_DRIVER': '%s' % (storage),
         'STORAGE_USERS_DRIVER': '%s' % (storage),
         'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index d64e2c7cc..a850bb42f 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -244,6 +244,8 @@ func rules(cfg *config.Config) map[string]interface{} {
 		cfg.Reva.StorageUsers.MountPath:      cfg.Reva.StorageUsers.Endpoint,
 		cfg.Reva.StorageUsers.MountID:        cfg.Reva.StorageUsers.Endpoint,
 		cfg.Reva.StoragePublicLink.MountPath: cfg.Reva.StoragePublicLink.Endpoint,
+		//TODO remove after talking to @jfd
+		cfg.Reva.StoragePublicLink.MountID: cfg.Reva.StorageHome.Endpoint,
 		// public link storage returns the mount id of the actual storage
 		// medatada storage not part of the global namespace
 	}
diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go
index 95c25a933..7c182f894 100644
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -233,6 +233,14 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 			Destination: &cfg.Reva.StoragePublicLink.MountPath,
 		},
 		// public-link has no mount id
+		// TODO after talking to @jfd
+		&cli.StringFlag{
+			Name:        "storage-public-link-mount-id",
+			Value:       "1284d238-aa92-42ce-bdc4-0b0000009162",
+			Usage:       "mount id",
+			EnvVars:     []string{"STORAGE_PUBLIC_LINK_MOUNT_ID"},
+			Destination: &cfg.Reva.StoragePublicLink.MountID,
+		},
 	}
 
 	flags = append(flags, TracingWithConfig(cfg)...)
diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go
index 97bf7e343..0bdf8c4c3 100644
--- a/storage/pkg/flagset/storagehome.go
+++ b/storage/pkg/flagset/storagehome.go
@@ -85,7 +85,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
 			Name: "mount-id",
 			// This is the mount id of the storage provider using the same storage driver
 			// as /home but withoud home enabled.
-			Value:       "1284d238-aa92-42ce-bdc4-0b0000009154", // /users
+			Value:       "1284d238-aa92-42ce-bdc4-0b0000009162", // /users
 			Usage:       "mount id",
 			EnvVars:     []string{"STORAGE_HOME_MOUNT_ID"},
 			Destination: &cfg.Reva.StorageHome.MountID,