From b75cfbf39e5e36efcb06c013f30c0ba81facebde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 9 Jul 2020 10:33:35 +0200
Subject: [PATCH 1/2] make frontend prefixes configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 pkg/command/frontend.go |  4 +++-
 pkg/config/config.go    | 11 ++++++++++-
 pkg/flagset/frontend.go | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/pkg/command/frontend.go b/pkg/command/frontend.go
index 6ce3ec5..01d5e0d 100644
--- a/pkg/command/frontend.go
+++ b/pkg/command/frontend.go
@@ -120,12 +120,13 @@ func Frontend(cfg *config.Config) *cli.Command {
 						// TODO build services dynamically
 						"services": map[string]interface{}{
 							"datagateway": map[string]interface{}{
+								"prefix":                 cfg.Reva.Frontend.DatagatewayPrefix,
 								"transfer_shared_secret": cfg.Reva.TransferSecret,
 								"timeout":                86400,
 								"insecure":               true,
 							},
 							"ocdav": map[string]interface{}{
-								"prefix":           "",
+								"prefix":           cfg.Reva.Frontend.OCDavPrefix,
 								"chunk_folder":     "/var/tmp/reva/chunks",
 								"files_namespace":  cfg.Reva.OCDav.DavFilesNamespace,
 								"webdav_namespace": cfg.Reva.OCDav.WebdavNamespace,
@@ -134,6 +135,7 @@ func Frontend(cfg *config.Config) *cli.Command {
 								"disable_tus":      cfg.Reva.UploadDisableTus,
 							},
 							"ocs": map[string]interface{}{
+								"prefix": cfg.Reva.Frontend.OCSPrefix,
 								"config": map[string]interface{}{
 									"version": "1.8",
 									"website": "reva",
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 942b48b..2c3f7be 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -65,6 +65,15 @@ type Users struct {
 	JSON   string
 }
 
+// FrontendPort defines the available frontend configuration.
+type FrontendPort struct {
+	Port
+
+	DatagatewayPrefix string
+	OCDavPrefix       string
+	OCSPrefix         string
+}
+
 // StoragePort defines the available storage configuration.
 type StoragePort struct {
 	Port
@@ -230,7 +239,7 @@ type Reva struct {
 	OCDav           OCDav
 	Storages        StorageConfig
 	// Ports are used to configure which services to start on which port
-	Frontend          Port
+	Frontend          FrontendPort
 	DataGateway       Port
 	Gateway           Gateway
 	Users             Users
diff --git a/pkg/flagset/frontend.go b/pkg/flagset/frontend.go
index b4117df..4c559a7 100644
--- a/pkg/flagset/frontend.go
+++ b/pkg/flagset/frontend.go
@@ -147,6 +147,27 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 			Usage:   "--service ocdav [--service ocs]",
 			EnvVars: []string{"REVA_FRONTEND_SERVICES"},
 		},
+		&cli.StringFlag{
+			Name:        "datagateway-prefix",
+			Value:       "data",
+			Usage:       "datagateway prefix",
+			EnvVars:     []string{"REVA_FRONTEND_DATAGATEWAY_PREFIX"},
+			Destination: &cfg.Reva.Frontend.DatagatewayPrefix,
+		},
+		&cli.StringFlag{
+			Name:        "ocdav-prefix",
+			Value:       "",
+			Usage:       "owncloud webdav endpoint prefix",
+			EnvVars:     []string{"REVA_FRONTEND_OCDAV_PREFIX"},
+			Destination: &cfg.Reva.Frontend.OCDavPrefix,
+		},
+		&cli.StringFlag{
+			Name:        "ocs-prefix",
+			Value:       "ocs",
+			Usage:       "open collaboration services endpoint prefix",
+			EnvVars:     []string{"REVA_FRONTEND_OCS_PREFIX"},
+			Destination: &cfg.Reva.Frontend.OCDavPrefix,
+		},
 
 		// Gateway
 

From 5bd582484e89858f66134dccd995e8fa259e5b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 9 Jul 2020 11:17:53 +0200
Subject: [PATCH 2/2] add changelog, fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 .../make-frontend-prefixes-configurable.md         | 14 ++++++++++++++
 pkg/flagset/frontend.go                            |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 changelog/unreleased/make-frontend-prefixes-configurable.md

diff --git a/changelog/unreleased/make-frontend-prefixes-configurable.md b/changelog/unreleased/make-frontend-prefixes-configurable.md
new file mode 100644
index 0000000..becf695
--- /dev/null
+++ b/changelog/unreleased/make-frontend-prefixes-configurable.md
@@ -0,0 +1,14 @@
+Enhancement: make frontend prefixes configurable
+
+We introduce three new environment variables and preconfigure them the following way:
+
+```
+REVA_FRONTEND_DATAGATEWAY_PREFIX="data"
+REVA_FRONTEND_OCDAV_PREFIX=""
+REVA_FRONTEND_OCS_PREFIX="ocs"
+```
+
+This restores the reva defaults that were changed upstream.
+
+https://github.com/owncloud/ocis-reva/pull/363
+https://github.com/cs3org/reva/pull/936/files#diff-51bf4fb310f7362f5c4306581132fc3bR63
\ No newline at end of file
diff --git a/pkg/flagset/frontend.go b/pkg/flagset/frontend.go
index 4c559a7..94ec4a9 100644
--- a/pkg/flagset/frontend.go
+++ b/pkg/flagset/frontend.go
@@ -166,7 +166,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 			Value:       "ocs",
 			Usage:       "open collaboration services endpoint prefix",
 			EnvVars:     []string{"REVA_FRONTEND_OCS_PREFIX"},
-			Destination: &cfg.Reva.Frontend.OCDavPrefix,
+			Destination: &cfg.Reva.Frontend.OCSPrefix,
 		},
 
 		// Gateway