From c55693723af30156a0821d8a76fab05779eedcb4 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Thu, 21 Jul 2022 16:05:35 +0430
Subject: [PATCH 01/16] configuration changed

---
 revad/templates/deployment.yaml |   6 +-
 revad/values.yaml               | 150 +++++++++++++++++++++++++++++++-
 2 files changed, 154 insertions(+), 2 deletions(-)

diff --git a/revad/templates/deployment.yaml b/revad/templates/deployment.yaml
index c8b69e5..abbbab2 100644
--- a/revad/templates/deployment.yaml
+++ b/revad/templates/deployment.yaml
@@ -31,7 +31,11 @@ spec:
             - /usr/bin/revad
           args:
               - "-c"
-              - "/etc/revad/revad.toml"
+              - {{ if eq .Values.EFSS "OWNCLOUD" }}
+                  {{- "/etc/revad/oc.revad.toml" }}
+                {{ else }}
+                  {{- "/etc/revad/revad.toml" }}
+                {{end}}
               - "-p"
               - "/var/run/revad.pid"
           volumeMounts:
diff --git a/revad/values.yaml b/revad/values.yaml
index a7dcb09..5aad20b 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -68,7 +68,7 @@ envFrom: []
   #     name: reva-envars
   # - secretRef:
   #     name: reva-secrets
-
+EFSS: ""
 ingress:
   enabled: false
   services:
@@ -118,7 +118,155 @@ configFiles:
     [http.services.ocmd]
     [http.services.ocdav]
     [http.services.ocs]
+  oc.revad.toml: |
+    [shared]
+    gatewaysvc = "revaoc1.docker:19000"
+
+    [grpc]
+    address = "0.0.0.0:19000"
+
+    [grpc.services.gateway]
+    authregistrysvc = "revaoc1.docker:19000"
+    appprovidersvc = "revaoc1.docker:19000"
+    appregistry = "revaoc1.docker:19000"
+    storageregistrysvc = "revaoc1.docker:19000"
+    preferencessvc = "revaoc1.docker:19000"
+    userprovidersvc = "revaoc1.docker:19000"
+    usershareprovidersvc = "revaoc1.docker:19000"
+    publicshareprovidersvc = "revaoc1.docker:19000"
+    ocmcoresvc = "revaoc1.docker:19000"
+    ocmshareprovidersvc = "revaoc1.docker:19000"
+    ocminvitemanagersvc = "revaoc1.docker:19000"
+    ocmproviderauthorizersvc = "revaoc1.docker:19000"
+    commit_share_to_storage_grant = false
+    datagateway = "http://localhost/data"
+    transfer_expires = 6 # give it a moment
+
+    [grpc.services.authregistry]
+    driver = "static"
+
+    [grpc.services.authregistry.drivers.static.rules]
+    basic = "revaoc1.docker:19000"
+
+    [grpc.services.storageregistry]
+    driver = "static"
+
+    [grpc.services.storageregistry.drivers.static]
+    home_provider = "/home"
+
+    [grpc.services.storageregistry.drivers.static.rules]
+    "/home" = {"address" = "revaoc1.docker:19000"}
+    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "revaoc1.docker:19000"}
+
+    [grpc.services.usershareprovider]
+    driver = "memory"
+
+    [grpc.services.ocmcore]
+    driver = "nextcloud"
+
+    [grpc.services.ocmcore.drivers.nextcloud]
+    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
+    shared_secret = "shared-secret-1"
+    mock_http = false
+
+    [grpc.services.ocminvitemanager]
+    driver = "json"
+
+    [grpc.services.ocmshareprovider]
+    driver = "nextcloud"
+
+    [grpc.services.ocmshareprovider.drivers.nextcloud]
+    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
+    shared_secret = "shared-secret-1"
+    mock_http = false
+
+    [grpc.services.ocmproviderauthorizer]
+    driver = "json"
+
+    [grpc.services.ocmproviderauthorizer.drivers.json]
+    providers = "providers.demo.json"
+    verify_request_hostname = true
+
+    [grpc.services.publicshareprovider]
+    driver = "memory"
+
+    [grpc.services.appprovider]
+    driver = "demo"
+    iopsecret = "testsecret"
+    wopiurl = "http://0.0.0.0:8880/"
+    wopibridgeurl = "http://localhost:8000/wopib"
+
+    [grpc.services.appregistry]
+    driver = "static"
+
+    [grpc.services.appregistry.static.rules]
+    "text/plain" = "revaoc1.docker:19000"
+    "text/markdown" = "revaoc1.docker:19000"
+    "application/compressed-markdown" = "revaoc1.docker:19000"
+    "application/vnd.oasis.opendocument.text" = "revaoc1.docker:19000"
+    "application/vnd.oasis.opendocument.spreadsheet" = "revaoc1.docker:19000"
+    "application/vnd.oasis.opendocument.presentation" = "revaoc1.docker:19000"
+
+    [grpc.services.storageprovider]
+    driver = "nextcloud"
+
+    [grpc.services.storageprovider.drivers.nextcloud]
+    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
+    shared_secret = "shared-secret-1"
+    mock_http = false
+
+    [grpc.services.authprovider]
+    auth_manager = "nextcloud"
+
+    [grpc.services.authprovider.auth_managers.nextcloud]
+    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
+    shared_secret = "shared-secret-1"
+    mock_http = false
+
+    [grpc.services.userprovider]
+    driver = "nextcloud"
+
+    [grpc.services.userprovider.drivers.nextcloud]
+    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
+    shared_secret = "shared-secret-1"
+    mock_http = false
+
+    [http]
+    enabled_services = ["ocmd"]
+    enabled_middlewares = ["providerauthorizer", "cors"]
+    address = "0.0.0.0:443"
+    certfile = "/etc/revad/tls/revaoc1.crt"
+    keyfile = "/etc/revad/tls/revaoc1.key"
+
+    [http.services.dataprovider]
+    driver = "localhome"
+
+    [http.services.prometheus]
+    [http.services.sysinfo]
+
+    [http.services.dataprovider.drivers.localhome]
+    user_layout = "{{.Username}}"
+
+    [http.services.ocmd]
+    prefix = "ocm"
+
+    [http.services.ocmd.config]
+    host = "revaoc1.docker"
+    provider = "test-revaoc1"
+
+    [http.middlewares.providerauthorizer]
+    driver = "json"
+
+    [http.middlewares.providerauthorizer.drivers.json]
+    providers = "providers.demo.json"
+
+    [http.services.ocs]
+    prefix = "ocs"
+
+    [http.services.ocdav]
+    prefix = "ocdav"
 
+    [http.middlewares.cors]
   users.json: |
     [
       {

From 7d2f17a19fbde0a95f2ca4d56cb4f7d9e0abbabd Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Thu, 21 Jul 2022 16:09:56 +0430
Subject: [PATCH 02/16] update read me

---
 revad/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/revad/README.md b/revad/README.md
index e39630f..f4f4d03 100644
--- a/revad/README.md
+++ b/revad/README.md
@@ -16,6 +16,7 @@ To install the chart with the release name `my-reva`:
 ```console
 $ helm install my-reva cs3org/revad
 ```
+Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication Owncloud  
 
 ## Uninstalling the Chart
 

From 7a58511de95ed5b70d9bd5f3a938af756828c8ac Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Fri, 22 Jul 2022 21:55:36 +0430
Subject: [PATCH 03/16] update readme

---
 revad/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/revad/README.md b/revad/README.md
index f4f4d03..e23131d 100644
--- a/revad/README.md
+++ b/revad/README.md
@@ -16,7 +16,7 @@ To install the chart with the release name `my-reva`:
 ```console
 $ helm install my-reva cs3org/revad
 ```
-Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication Owncloud  
+Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication with Owncloud  
 
 ## Uninstalling the Chart
 

From 642bc553b8a3bf50763e55756d7c93da4108bfde Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Wed, 27 Jul 2022 11:04:48 +0430
Subject: [PATCH 04/16] finish with error

---
 revad/templates/configmap.yaml  | 11 ++++-
 revad/templates/deployment.yaml |  2 +-
 revad/values.yaml               | 75 ++++++++++++++++++---------------
 3 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml
index 7092b65..e9de7d6 100644
--- a/revad/templates/configmap.yaml
+++ b/revad/templates/configmap.yaml
@@ -6,8 +6,17 @@ metadata:
   labels:
     {{- include "revad.labels" . | nindent 4 }}
 data:
+{{- $host := .Values.HostURL }}
+{{- $ocHost := .Values.OCURL }}
+{{- $secret := .Values.SharedSecret }}
+{{- $certFile := .Values.CertFile }}
+{{- $certKey := .Values.CertKey }}
 {{- range $filename, $fileContents := .Values.configFiles }}
   {{ $filename }}: |-
-{{ $fileContents | indent 4 }}
+{{ if eq $filename "oc.revad.toml" }}
+  {{ $fileContents | indent 4 | replace "OC_URL" $ocHost | replace "HOST_URL" $host | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey }}
+{{ else }}  
+  {{ $fileContents | indent 4 }}
+{{ end }}  
 {{- end }}
 {{- end }}
diff --git a/revad/templates/deployment.yaml b/revad/templates/deployment.yaml
index abbbab2..96d2bd7 100644
--- a/revad/templates/deployment.yaml
+++ b/revad/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
                   {{- "/etc/revad/oc.revad.toml" }}
                 {{ else }}
                   {{- "/etc/revad/revad.toml" }}
-                {{end}}
+                {{ end }}
               - "-p"
               - "/var/run/revad.pid"
           volumeMounts:
diff --git a/revad/values.yaml b/revad/values.yaml
index 5aad20b..a8879d1 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -69,6 +69,11 @@ envFrom: []
   # - secretRef:
   #     name: reva-secrets
 EFSS: ""
+HostURL: "localhost:19000"
+OCURL: "oc.docker"
+SharedSecret: "123456"
+CertFile: "revaoc1.crt"
+CertKey: "revaoc1.key"
 ingress:
   enabled: false
   services:
@@ -120,24 +125,24 @@ configFiles:
     [http.services.ocs]
   oc.revad.toml: |
     [shared]
-    gatewaysvc = "revaoc1.docker:19000"
+    gatewaysvc = "HOST_URL:19000"
 
     [grpc]
     address = "0.0.0.0:19000"
 
     [grpc.services.gateway]
-    authregistrysvc = "revaoc1.docker:19000"
-    appprovidersvc = "revaoc1.docker:19000"
-    appregistry = "revaoc1.docker:19000"
-    storageregistrysvc = "revaoc1.docker:19000"
-    preferencessvc = "revaoc1.docker:19000"
-    userprovidersvc = "revaoc1.docker:19000"
-    usershareprovidersvc = "revaoc1.docker:19000"
-    publicshareprovidersvc = "revaoc1.docker:19000"
-    ocmcoresvc = "revaoc1.docker:19000"
-    ocmshareprovidersvc = "revaoc1.docker:19000"
-    ocminvitemanagersvc = "revaoc1.docker:19000"
-    ocmproviderauthorizersvc = "revaoc1.docker:19000"
+    authregistrysvc = "HOST_URL:19000"
+    appprovidersvc = "HOST_URL:19000"
+    appregistry = "HOST_URL:19000"
+    storageregistrysvc = "HOST_URL:19000"
+    preferencessvc = "HOST_URL:19000"
+    userprovidersvc = "HOST_URL:19000"
+    usershareprovidersvc = "HOST_URL:19000"
+    publicshareprovidersvc = "HOST_URL:19000"
+    ocmcoresvc = "HOST_URL:19000"
+    ocmshareprovidersvc = "HOST_URL:19000"
+    ocminvitemanagersvc = "HOST_URL:19000"
+    ocmproviderauthorizersvc = "HOST_URL:19000"
     commit_share_to_storage_grant = false
     datagateway = "http://localhost/data"
     transfer_expires = 6 # give it a moment
@@ -146,7 +151,7 @@ configFiles:
     driver = "static"
 
     [grpc.services.authregistry.drivers.static.rules]
-    basic = "revaoc1.docker:19000"
+    basic = "HOST_URL:19000"
 
     [grpc.services.storageregistry]
     driver = "static"
@@ -155,8 +160,8 @@ configFiles:
     home_provider = "/home"
 
     [grpc.services.storageregistry.drivers.static.rules]
-    "/home" = {"address" = "revaoc1.docker:19000"}
-    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "revaoc1.docker:19000"}
+    "/home" = {"address" = "HOST_URL:19000"}
+    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "HOST_URL:19000"}
 
     [grpc.services.usershareprovider]
     driver = "memory"
@@ -165,8 +170,8 @@ configFiles:
     driver = "nextcloud"
 
     [grpc.services.ocmcore.drivers.nextcloud]
-    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
-    shared_secret = "shared-secret-1"
+    endpoint = "https://OC_URL/index.php/apps/sciencemesh/"
+    shared_secret = "SHARED_SECRET"
     mock_http = false
 
     [grpc.services.ocminvitemanager]
@@ -176,8 +181,8 @@ configFiles:
     driver = "nextcloud"
 
     [grpc.services.ocmshareprovider.drivers.nextcloud]
-    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
-    shared_secret = "shared-secret-1"
+    endpoint = "https://OC_URL/index.php/apps/sciencemesh/"
+    shared_secret = "SHARED_SECRET"
     mock_http = false
 
     [grpc.services.ocmproviderauthorizer]
@@ -200,43 +205,43 @@ configFiles:
     driver = "static"
 
     [grpc.services.appregistry.static.rules]
-    "text/plain" = "revaoc1.docker:19000"
-    "text/markdown" = "revaoc1.docker:19000"
-    "application/compressed-markdown" = "revaoc1.docker:19000"
-    "application/vnd.oasis.opendocument.text" = "revaoc1.docker:19000"
-    "application/vnd.oasis.opendocument.spreadsheet" = "revaoc1.docker:19000"
-    "application/vnd.oasis.opendocument.presentation" = "revaoc1.docker:19000"
+    "text/plain" = "HOST_URL:19000"
+    "text/markdown" = "HOST_URL:19000"
+    "application/compressed-markdown" = "HOST_URL:19000"
+    "application/vnd.oasis.opendocument.text" = "HOST_URL:19000"
+    "application/vnd.oasis.opendocument.spreadsheet" = "HOST_URL:19000"
+    "application/vnd.oasis.opendocument.presentation" = "HOST_URL:19000"
 
     [grpc.services.storageprovider]
     driver = "nextcloud"
 
     [grpc.services.storageprovider.drivers.nextcloud]
-    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
-    shared_secret = "shared-secret-1"
+    endpoint = "https://OC_URL/index.php/apps/sciencemesh/"
+    shared_secret = "SHARED_SECRET"
     mock_http = false
 
     [grpc.services.authprovider]
     auth_manager = "nextcloud"
 
     [grpc.services.authprovider.auth_managers.nextcloud]
-    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
-    shared_secret = "shared-secret-1"
+    endpoint = "https://OC_URL/index.php/apps/sciencemesh/"
+    shared_secret = "SHARED_SECRET"
     mock_http = false
 
     [grpc.services.userprovider]
     driver = "nextcloud"
 
     [grpc.services.userprovider.drivers.nextcloud]
-    endpoint = "https://oc1.docker/index.php/apps/sciencemesh/"
-    shared_secret = "shared-secret-1"
+    endpoint = "https://OC_URL/index.php/apps/sciencemesh/"
+    shared_secret = "SHARED_SECRET"
     mock_http = false
 
     [http]
     enabled_services = ["ocmd"]
     enabled_middlewares = ["providerauthorizer", "cors"]
     address = "0.0.0.0:443"
-    certfile = "/etc/revad/tls/revaoc1.crt"
-    keyfile = "/etc/revad/tls/revaoc1.key"
+    certfile = "/etc/revad/tls/CERT_FILE"
+    keyfile = "/etc/revad/tls/CERT_KEY"
 
     [http.services.dataprovider]
     driver = "localhome"
@@ -251,7 +256,7 @@ configFiles:
     prefix = "ocm"
 
     [http.services.ocmd.config]
-    host = "revaoc1.docker"
+    host = "HOST_URL"
     provider = "test-revaoc1"
 
     [http.middlewares.providerauthorizer]

From f1701d1a9b9d0f9a919be0a1282cb7dedc88a576 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Wed, 27 Jul 2022 12:25:28 +0430
Subject: [PATCH 05/16] readme updating

---
 revad/README.md                | 12 ++++-
 revad/templates/configmap.yaml |  7 +--
 revad/values.yaml              | 89 +++++++++++++++++-----------------
 3 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/revad/README.md b/revad/README.md
index e23131d..624fa8e 100644
--- a/revad/README.md
+++ b/revad/README.md
@@ -16,7 +16,17 @@ To install the chart with the release name `my-reva`:
 ```console
 $ helm install my-reva cs3org/revad
 ```
-Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication with Owncloud  
+Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication with OpenCloud Mesh  
+
+ **Below parameters can be provided when you are trying start reva communicate with OpenCloud Mesh**
+| Parameter | Default value | Description |
+|---|---|---|
+|HostURL |localhost| the host name that revad is hosted on|
+|HostPort|19000|The port that revad is litening on|
+|OCURL|oc.docker|The URL of OpenCloud mesh provider|
+|SharedSecret|123456| The secret that is shared with sciencemesh application|
+|CertFile|revaoc1.crt| Name of ssl certificate file|
+|CertKey|revaoc1.key| Name of ssl certificate key file|
 
 ## Uninstalling the Chart
 
diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml
index e9de7d6..d88f5da 100644
--- a/revad/templates/configmap.yaml
+++ b/revad/templates/configmap.yaml
@@ -11,12 +11,9 @@ data:
 {{- $secret := .Values.SharedSecret }}
 {{- $certFile := .Values.CertFile }}
 {{- $certKey := .Values.CertKey }}
+{{- $port := .Values.HostPort }}
 {{- range $filename, $fileContents := .Values.configFiles }}
   {{ $filename }}: |-
-{{ if eq $filename "oc.revad.toml" }}
-  {{ $fileContents | indent 4 | replace "OC_URL" $ocHost | replace "HOST_URL" $host | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey }}
-{{ else }}  
-  {{ $fileContents | indent 4 }}
-{{ end }}  
+{{ $fileContents | replace "OC_URL" $ocHost | replace "HOST_URL" $host | replace "HOST_PORT" $port | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey |  indent 4 }} 
 {{- end }}
 {{- end }}
diff --git a/revad/values.yaml b/revad/values.yaml
index a8879d1..423c25b 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -8,7 +8,7 @@ image:
 service:
   type: ClusterIP
   grpc:
-    port: 19000
+    port: HOST_PORT
   http:
     port: 19001
 
@@ -69,7 +69,8 @@ envFrom: []
   # - secretRef:
   #     name: reva-secrets
 EFSS: ""
-HostURL: "localhost:19000"
+HostURL: "localhost"
+HostPort: "19000"
 OCURL: "oc.docker"
 SharedSecret: "123456"
 CertFile: "revaoc1.crt"
@@ -125,24 +126,24 @@ configFiles:
     [http.services.ocs]
   oc.revad.toml: |
     [shared]
-    gatewaysvc = "HOST_URL:19000"
+    gatewaysvc = "HOST_URL:HOST_PORT"
 
     [grpc]
-    address = "0.0.0.0:19000"
+    address = "0.0.0.0:HOST_PORT"
 
     [grpc.services.gateway]
-    authregistrysvc = "HOST_URL:19000"
-    appprovidersvc = "HOST_URL:19000"
-    appregistry = "HOST_URL:19000"
-    storageregistrysvc = "HOST_URL:19000"
-    preferencessvc = "HOST_URL:19000"
-    userprovidersvc = "HOST_URL:19000"
-    usershareprovidersvc = "HOST_URL:19000"
-    publicshareprovidersvc = "HOST_URL:19000"
-    ocmcoresvc = "HOST_URL:19000"
-    ocmshareprovidersvc = "HOST_URL:19000"
-    ocminvitemanagersvc = "HOST_URL:19000"
-    ocmproviderauthorizersvc = "HOST_URL:19000"
+    authregistrysvc = "HOST_URL:HOST_PORT"
+    appprovidersvc = "HOST_URL:HOST_PORT"
+    appregistry = "HOST_URL:HOST_PORT"
+    storageregistrysvc = "HOST_URL:HOST_PORT"
+    preferencessvc = "HOST_URL:HOST_PORT"
+    userprovidersvc = "HOST_URL:HOST_PORT"
+    usershareprovidersvc = "HOST_URL:HOST_PORT"
+    publicshareprovidersvc = "HOST_URL:HOST_PORT"
+    ocmcoresvc = "HOST_URL:HOST_PORT"
+    ocmshareprovidersvc = "HOST_URL:HOST_PORT"
+    ocminvitemanagersvc = "HOST_URL:HOST_PORT"
+    ocmproviderauthorizersvc = "HOST_URL:HOST_PORT"
     commit_share_to_storage_grant = false
     datagateway = "http://localhost/data"
     transfer_expires = 6 # give it a moment
@@ -151,7 +152,7 @@ configFiles:
     driver = "static"
 
     [grpc.services.authregistry.drivers.static.rules]
-    basic = "HOST_URL:19000"
+    basic = "HOST_URL:HOST_PORT"
 
     [grpc.services.storageregistry]
     driver = "static"
@@ -160,8 +161,8 @@ configFiles:
     home_provider = "/home"
 
     [grpc.services.storageregistry.drivers.static.rules]
-    "/home" = {"address" = "HOST_URL:19000"}
-    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "HOST_URL:19000"}
+    "/home" = {"address" = "HOST_URL:HOST_PORT"}
+    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "HOST_URL:HOST_PORT"}
 
     [grpc.services.usershareprovider]
     driver = "memory"
@@ -205,12 +206,12 @@ configFiles:
     driver = "static"
 
     [grpc.services.appregistry.static.rules]
-    "text/plain" = "HOST_URL:19000"
-    "text/markdown" = "HOST_URL:19000"
-    "application/compressed-markdown" = "HOST_URL:19000"
-    "application/vnd.oasis.opendocument.text" = "HOST_URL:19000"
-    "application/vnd.oasis.opendocument.spreadsheet" = "HOST_URL:19000"
-    "application/vnd.oasis.opendocument.presentation" = "HOST_URL:19000"
+    "text/plain" = "HOST_URL:HOST_PORT"
+    "text/markdown" = "HOST_URL:HOST_PORT"
+    "application/compressed-markdown" = "HOST_URL:HOST_PORT"
+    "application/vnd.oasis.opendocument.text" = "HOST_URL:HOST_PORT"
+    "application/vnd.oasis.opendocument.spreadsheet" = "HOST_URL:HOST_PORT"
+    "application/vnd.oasis.opendocument.presentation" = "HOST_URL:HOST_PORT"
 
     [grpc.services.storageprovider]
     driver = "nextcloud"
@@ -277,7 +278,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "username": "einstein",
         "secret": "relativity",
@@ -288,7 +289,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "username": "marie",
         "secret": "radioactivity",
@@ -299,7 +300,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "username": "richard",
         "secret": "superfluidity",
@@ -314,7 +315,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "sailing-lovers",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "sailing-lovers",
         "mail": "sailing-lovers@example.org",
@@ -324,7 +325,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -332,7 +333,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "violin-haters",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "violin-haters",
         "mail": "violin-haters@example.org",
@@ -342,7 +343,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -350,7 +351,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "radium-lovers",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "radium-lovers",
         "mail": "radium-lovers@example.org",
@@ -360,7 +361,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -368,7 +369,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "polonium-lovers",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "polonium-lovers",
         "mail": "polonium-lovers@example.org",
@@ -378,7 +379,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -386,7 +387,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "quantum-lovers",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "quantum-lovers",
         "mail": "quantum-lovers@example.org",
@@ -396,7 +397,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -404,7 +405,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "philosophy-haters",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "philosophy-haters",
         "mail": "philosophy-haters@example.org",
@@ -414,7 +415,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]
@@ -422,7 +423,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "physics-lovers",
-          "idp": "localhost:19000"
+          "idp": "HOST_URL:HOST_PORT"
         },
         "group_name": "physics-lovers",
         "mail": "physics-lovers@example.org",
@@ -432,19 +433,19 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           },
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           },
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "localhost:19000"
+              "idp": "HOST_URL:HOST_PORT"
             }
           }
         ]

From f9dd4fe1f67dbc1cb0992aac4e2afef229195152 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Wed, 27 Jul 2022 17:43:17 +0430
Subject: [PATCH 06/16] revert serviece port

---
 revad/templates/configmap.yaml | 2 +-
 revad/templates/service.yaml   | 4 ++--
 revad/values.yaml              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml
index d88f5da..37bb123 100644
--- a/revad/templates/configmap.yaml
+++ b/revad/templates/configmap.yaml
@@ -11,7 +11,7 @@ data:
 {{- $secret := .Values.SharedSecret }}
 {{- $certFile := .Values.CertFile }}
 {{- $certKey := .Values.CertKey }}
-{{- $port := .Values.HostPort }}
+{{- $port := toString .Values.HostPort }}
 {{- range $filename, $fileContents := .Values.configFiles }}
   {{ $filename }}: |-
 {{ $fileContents | replace "OC_URL" $ocHost | replace "HOST_URL" $host | replace "HOST_PORT" $port | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey |  indent 4 }} 
diff --git a/revad/templates/service.yaml b/revad/templates/service.yaml
index 5fba114..6a309a6 100644
--- a/revad/templates/service.yaml
+++ b/revad/templates/service.yaml
@@ -9,13 +9,13 @@ spec:
   ports:
     {{- if .Values.service.http }}
     - port: {{ .Values.service.http.port }}
-      targetPort: http
+      targetPort: 8050
       protocol: TCP
       name: http
     {{- end }}
     {{- if .Values.service.grpc }}
     - port: {{ .Values.service.grpc.port }}
-      targetPort: grpc
+      targetPort: 8053
       protocol: TCP
       name: grpc
     {{- end }}
diff --git a/revad/values.yaml b/revad/values.yaml
index 423c25b..9541a7e 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -8,7 +8,7 @@ image:
 service:
   type: ClusterIP
   grpc:
-    port: HOST_PORT
+    port: 19000
   http:
     port: 19001
 

From 2ef7abd2b8948abfdc251a8852d94ea59a93f89b Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Thu, 28 Jul 2022 14:28:25 +0430
Subject: [PATCH 07/16] remove HostUrl and host port

---
 revad/README.md                |  2 -
 revad/templates/configmap.yaml |  2 +-
 revad/values.yaml              | 88 +++++++++++++++++-----------------
 3 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/revad/README.md b/revad/README.md
index 624fa8e..ebfac9c 100644
--- a/revad/README.md
+++ b/revad/README.md
@@ -21,8 +21,6 @@ Also, you can use `--set EFSS=OWNCLOUD` to config Reva for communication with Op
  **Below parameters can be provided when you are trying start reva communicate with OpenCloud Mesh**
 | Parameter | Default value | Description |
 |---|---|---|
-|HostURL |localhost| the host name that revad is hosted on|
-|HostPort|19000|The port that revad is litening on|
 |OCURL|oc.docker|The URL of OpenCloud mesh provider|
 |SharedSecret|123456| The secret that is shared with sciencemesh application|
 |CertFile|revaoc1.crt| Name of ssl certificate file|
diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml
index 37bb123..ceac780 100644
--- a/revad/templates/configmap.yaml
+++ b/revad/templates/configmap.yaml
@@ -14,6 +14,6 @@ data:
 {{- $port := toString .Values.HostPort }}
 {{- range $filename, $fileContents := .Values.configFiles }}
   {{ $filename }}: |-
-{{ $fileContents | replace "OC_URL" $ocHost | replace "HOST_URL" $host | replace "HOST_PORT" $port | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey |  indent 4 }} 
+{{ $fileContents | replace "OC_URL" $ocHost | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey |  indent 4 }} 
 {{- end }}
 {{- end }}
diff --git a/revad/values.yaml b/revad/values.yaml
index 9541a7e..ebc5b91 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -69,8 +69,6 @@ envFrom: []
   # - secretRef:
   #     name: reva-secrets
 EFSS: ""
-HostURL: "localhost"
-HostPort: "19000"
 OCURL: "oc.docker"
 SharedSecret: "123456"
 CertFile: "revaoc1.crt"
@@ -126,24 +124,24 @@ configFiles:
     [http.services.ocs]
   oc.revad.toml: |
     [shared]
-    gatewaysvc = "HOST_URL:HOST_PORT"
+    gatewaysvc = "localhost:19000"
 
     [grpc]
-    address = "0.0.0.0:HOST_PORT"
+    address = "0.0.0.0:19000"
 
     [grpc.services.gateway]
-    authregistrysvc = "HOST_URL:HOST_PORT"
-    appprovidersvc = "HOST_URL:HOST_PORT"
-    appregistry = "HOST_URL:HOST_PORT"
-    storageregistrysvc = "HOST_URL:HOST_PORT"
-    preferencessvc = "HOST_URL:HOST_PORT"
-    userprovidersvc = "HOST_URL:HOST_PORT"
-    usershareprovidersvc = "HOST_URL:HOST_PORT"
-    publicshareprovidersvc = "HOST_URL:HOST_PORT"
-    ocmcoresvc = "HOST_URL:HOST_PORT"
-    ocmshareprovidersvc = "HOST_URL:HOST_PORT"
-    ocminvitemanagersvc = "HOST_URL:HOST_PORT"
-    ocmproviderauthorizersvc = "HOST_URL:HOST_PORT"
+    authregistrysvc = "localhost:19000"
+    appprovidersvc = "localhost:19000"
+    appregistry = "localhost:19000"
+    storageregistrysvc = "localhost:19000"
+    preferencessvc = "localhost:19000"
+    userprovidersvc = "localhost:19000"
+    usershareprovidersvc = "localhost:19000"
+    publicshareprovidersvc = "localhost:19000"
+    ocmcoresvc = "localhost:19000"
+    ocmshareprovidersvc = "localhost:19000"
+    ocminvitemanagersvc = "localhost:19000"
+    ocmproviderauthorizersvc = "localhost:19000"
     commit_share_to_storage_grant = false
     datagateway = "http://localhost/data"
     transfer_expires = 6 # give it a moment
@@ -152,7 +150,7 @@ configFiles:
     driver = "static"
 
     [grpc.services.authregistry.drivers.static.rules]
-    basic = "HOST_URL:HOST_PORT"
+    basic = "localhost:19000"
 
     [grpc.services.storageregistry]
     driver = "static"
@@ -161,8 +159,8 @@ configFiles:
     home_provider = "/home"
 
     [grpc.services.storageregistry.drivers.static.rules]
-    "/home" = {"address" = "HOST_URL:HOST_PORT"}
-    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "HOST_URL:HOST_PORT"}
+    "/home" = {"address" = "localhost:19000"}
+    "123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:19000"}
 
     [grpc.services.usershareprovider]
     driver = "memory"
@@ -206,12 +204,12 @@ configFiles:
     driver = "static"
 
     [grpc.services.appregistry.static.rules]
-    "text/plain" = "HOST_URL:HOST_PORT"
-    "text/markdown" = "HOST_URL:HOST_PORT"
-    "application/compressed-markdown" = "HOST_URL:HOST_PORT"
-    "application/vnd.oasis.opendocument.text" = "HOST_URL:HOST_PORT"
-    "application/vnd.oasis.opendocument.spreadsheet" = "HOST_URL:HOST_PORT"
-    "application/vnd.oasis.opendocument.presentation" = "HOST_URL:HOST_PORT"
+    "text/plain" = "localhost:19000"
+    "text/markdown" = "localhost:19000"
+    "application/compressed-markdown" = "localhost:19000"
+    "application/vnd.oasis.opendocument.text" = "localhost:19000"
+    "application/vnd.oasis.opendocument.spreadsheet" = "localhost:19000"
+    "application/vnd.oasis.opendocument.presentation" = "localhost:19000"
 
     [grpc.services.storageprovider]
     driver = "nextcloud"
@@ -257,7 +255,7 @@ configFiles:
     prefix = "ocm"
 
     [http.services.ocmd.config]
-    host = "HOST_URL"
+    host = "localhost"
     provider = "test-revaoc1"
 
     [http.middlewares.providerauthorizer]
@@ -278,7 +276,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "username": "einstein",
         "secret": "relativity",
@@ -289,7 +287,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "username": "marie",
         "secret": "radioactivity",
@@ -300,7 +298,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "username": "richard",
         "secret": "superfluidity",
@@ -315,7 +313,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "sailing-lovers",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "sailing-lovers",
         "mail": "sailing-lovers@example.org",
@@ -325,7 +323,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -333,7 +331,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "violin-haters",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "violin-haters",
         "mail": "violin-haters@example.org",
@@ -343,7 +341,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -351,7 +349,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "radium-lovers",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "radium-lovers",
         "mail": "radium-lovers@example.org",
@@ -361,7 +359,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -369,7 +367,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "polonium-lovers",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "polonium-lovers",
         "mail": "polonium-lovers@example.org",
@@ -379,7 +377,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -387,7 +385,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "quantum-lovers",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "quantum-lovers",
         "mail": "quantum-lovers@example.org",
@@ -397,7 +395,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -405,7 +403,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "philosophy-haters",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "philosophy-haters",
         "mail": "philosophy-haters@example.org",
@@ -415,7 +413,7 @@ configFiles:
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]
@@ -423,7 +421,7 @@ configFiles:
       {
         "id": {
           "opaque_id": "physics-lovers",
-          "idp": "HOST_URL:HOST_PORT"
+          "idp": "localhost:19000"
         },
         "group_name": "physics-lovers",
         "mail": "physics-lovers@example.org",
@@ -433,19 +431,19 @@ configFiles:
           {
             "id": {
               "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           },
           {
             "id": {
               "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           },
           {
             "id": {
               "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-              "idp": "HOST_URL:HOST_PORT"
+              "idp": "localhost:19000"
             }
           }
         ]

From 0eb9e5b0eb7fcb87f59e97d1e7801f0392a3caa5 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 14:24:48 +0430
Subject: [PATCH 08/16] correct the provider file name

---
 revad/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index ebc5b91..d0283f8 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -188,7 +188,7 @@ configFiles:
     driver = "json"
 
     [grpc.services.ocmproviderauthorizer.drivers.json]
-    providers = "providers.demo.json"
+    providers = "ocm-providers.json"
     verify_request_hostname = true
 
     [grpc.services.publicshareprovider]
@@ -262,7 +262,7 @@ configFiles:
     driver = "json"
 
     [http.middlewares.providerauthorizer.drivers.json]
-    providers = "providers.demo.json"
+    providers = "ocm-providers.json"
 
     [http.services.ocs]
     prefix = "ocs"

From 28d3e77b668eadd907e037a8cfca379486411d6b Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 18:25:11 +0430
Subject: [PATCH 09/16] add ocm-provider

---
 revad/values.yaml | 249 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 248 insertions(+), 1 deletion(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index d0283f8..97cc4a3 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -451,4 +451,251 @@ configFiles:
     ]
 
   ocm-providers.json: |
-    []
+    [
+      {
+        "name": "cernbox",
+        "full_name": "CERNBox",
+        "organization": "CERN",
+        "domain": "cernbox.cern.ch",
+        "homepage": "https://cernbox.web.cern.ch",
+        "description": "CERNBox provides cloud data storage to all CERN users.",
+        "services": [
+          {
+            "endpoint": {
+              "type": {
+                "name": "OCM",
+                "description": "CERNBox Open Cloud Mesh API"
+              },
+              "name": "CERNBox - OCM API",
+              "path": "http://127.0.0.1:19001/ocm/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Webdav",
+                "description": "CERNBox Webdav API"
+              },
+              "name": "CERNBox - Webdav API",
+              "path": "http://127.0.0.1:19001/remote.php/webdav/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Gateway",
+                "description": "CERNBox GRPC Gateway"
+              },
+              "name": "CERNBox - GRPC Gateway",
+              "path": "127.0.0.1:19000",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "127.0.0.1:19000"
+          }
+        ]
+      },
+      {
+        "name": "oc-cesnet",
+        "full_name": "ownCloud@CESNET",
+        "organization": "CESNET",
+        "domain": "cesnet.cz",
+        "homepage": "https://owncloud.cesnet.cz",
+        "description": "OwnCloud has been designed for individual users.",
+        "services": [
+          {
+            "endpoint": {
+              "type": {
+                "name": "OCM",
+                "description": "CESNET Open Cloud Mesh API"
+              },
+              "name": "CESNET - OCM API",
+              "path": "http://127.0.0.1:17001/ocm/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:17001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Webdav",
+                "description": "CESNET Webdav API"
+              },
+              "name": "CESNET - Webdav API",
+              "path": "http://127.0.0.1:17001/remote.php/webdav/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:17001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Gateway",
+                "description": "CESNET GRPC Gateway"
+              },
+              "name": "CESNET - GRPC Gateway",
+              "path": "127.0.0.1:17000",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "127.0.0.1:17000"
+          }
+        ]
+      },
+      {
+        "name": "example",
+        "full_name": "ownCloud@Example",
+        "organization": "Example",
+        "domain": "example.org",
+        "homepage": "http://example.org",
+        "description": "Example cloud storage.",
+        "services": [
+          {
+            "endpoint": {
+              "type": {
+                "name": "OCM",
+                "description": "Example Open Cloud Mesh API"
+              },
+              "name": "Example - OCM API",
+              "path": "http://127.0.0.1:19001/ocm/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Webdav",
+                "description": "Example Webdav API"
+              },
+              "name": "Example - Webdav API",
+              "path": "http://127.0.0.1:19001/remote.php/webdav/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Gateway",
+                "description": "Example GRPC Gateway"
+              },
+              "name": "Example - GRPC Gateway",
+              "path": "127.0.0.1:19000",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "127.0.0.1:19000"
+          }
+        ]
+      },
+      {
+        "name": "test",
+        "full_name": "ownCloud@Test",
+        "organization": "Test",
+        "domain": "test.org",
+        "homepage": "http://test.org",
+        "description": "Test cloud storage.",
+        "services": [
+          {
+            "endpoint": {
+              "type": {
+                "name": "OCM",
+                "description": "Test Open Cloud Mesh API"
+              },
+              "name": "Test - OCM API",
+              "path": "http://127.0.0.1:19001/ocm/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Webdav",
+                "description": "Test Webdav API"
+              },
+              "name": "Test - Webdav API",
+              "path": "http://127.0.0.1:19001/remote.php/webdav/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Gateway",
+                "description": "Test GRPC Gateway"
+              },
+              "name": "Test - GRPC Gateway",
+              "path": "127.0.0.1:19000",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "127.0.0.1:19000"
+          }
+        ]
+      },
+      {
+        "name": "localhost",
+        "full_name": "localhost",
+        "organization": "Example",
+        "domain": "localhost",
+        "homepage": "http://example.org",
+        "description": "Example cloud storage.",
+        "services": [
+          {
+            "endpoint": {
+              "type": {
+                "name": "OCM",
+                "description": "Example Open Cloud Mesh API"
+              },
+              "name": "Example - OCM API",
+              "path": "http://127.0.0.1:19001/ocm/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Webdav",
+                "description": "Example Webdav API"
+              },
+              "name": "Example - Webdav API",
+              "path": "http://127.0.0.1:19001/remote.php/webdav/",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "http://127.0.0.1:19001/"
+          },
+          {
+            "endpoint": {
+              "type": {
+                "name": "Gateway",
+                "description": "Example GRPC Gateway"
+              },
+              "name": "Example - GRPC Gateway",
+              "path": "127.0.0.1:19000",
+              "is_monitored": true
+            },
+            "api_version": "0.0.1",
+            "host": "127.0.0.1:19000"
+          }
+        ]
+      }
+    ]
+

From 854d2131eadd74b0ba6903f8316b00c3b5abe87f Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 18:37:06 +0430
Subject: [PATCH 10/16] remove empty lines

---
 revad/values.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index 97cc4a3..e93c29d 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -307,7 +307,6 @@ configFiles:
         "groups": ["quantum-lovers", "philosophy-haters", "physics-lovers"]
       }
     ]
-
   groups.json: |
     [
       {
@@ -449,7 +448,6 @@ configFiles:
         ]
       }
     ]
-
   ocm-providers.json: |
     [
       {

From 6b424ab595aac7003e7392f588455bc8fbf19228 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 19:03:39 +0430
Subject: [PATCH 11/16] adjust provider path

---
 revad/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index e93c29d..b2642f8 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -188,7 +188,7 @@ configFiles:
     driver = "json"
 
     [grpc.services.ocmproviderauthorizer.drivers.json]
-    providers = "ocm-providers.json"
+    providers = "/etc/revad/ocm-providers.json"
     verify_request_hostname = true
 
     [grpc.services.publicshareprovider]
@@ -262,7 +262,7 @@ configFiles:
     driver = "json"
 
     [http.middlewares.providerauthorizer.drivers.json]
-    providers = "ocm-providers.json"
+    providers = "/etc/revad/ocm-providers.json"
 
     [http.services.ocs]
     prefix = "ocs"

From 5e540e0eef656bd28a725c7c9b81566670bcfbb8 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 19:54:38 +0430
Subject: [PATCH 12/16] change network to loadbalancer

---
 revad/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index b2642f8..57d7999 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: Always
 
 service:
-  type: ClusterIP
+  type: LoadBalancer
   grpc:
     port: 19000
   http:

From addbdb44a4462bf27e7afbba908b2a58047c2c9e Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 9 Aug 2022 19:58:29 +0430
Subject: [PATCH 13/16] revert network type to clusterip

---
 revad/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/revad/values.yaml b/revad/values.yaml
index 57d7999..b2642f8 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: Always
 
 service:
-  type: LoadBalancer
+  type: ClusterIP
   grpc:
     port: 19000
   http:

From c687490e77b14e16a3964f8abf5121ec75fa1735 Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 23 Aug 2022 14:24:35 +0430
Subject: [PATCH 14/16] revert service port config

---
 revad/templates/service.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/revad/templates/service.yaml b/revad/templates/service.yaml
index 6a309a6..5fba114 100644
--- a/revad/templates/service.yaml
+++ b/revad/templates/service.yaml
@@ -9,13 +9,13 @@ spec:
   ports:
     {{- if .Values.service.http }}
     - port: {{ .Values.service.http.port }}
-      targetPort: 8050
+      targetPort: http
       protocol: TCP
       name: http
     {{- end }}
     {{- if .Values.service.grpc }}
     - port: {{ .Values.service.grpc.port }}
-      targetPort: 8053
+      targetPort: grpc
       protocol: TCP
       name: grpc
     {{- end }}

From 23ed5715127b62a566cc0552ceeb3a8f566e189c Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Mon, 5 Sep 2022 15:44:45 +0200
Subject: [PATCH 15/16] Use revad v1.19.0, fix
 https://github.com/pondersource/sciencemesh-nextcloud/issues/70

---
 revad/Chart.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/revad/Chart.yaml b/revad/Chart.yaml
index 7d2133b..ce490a8 100644
--- a/revad/Chart.yaml
+++ b/revad/Chart.yaml
@@ -3,7 +3,7 @@ name: revad
 description: The Reva daemon (revad) helm chart
 type: application
 version: 1.4.0
-appVersion: v1.18.0
+appVersion: v1.19.0
 kubeVersion: ">= 1.19.0"
 icon: https://reva.link/logo.svg
 home: https://reva.link
@@ -23,7 +23,7 @@ keywords:
   - sync-and-share
 annotations:
   artifacthub.io/changes: |
-    - "Update revad image to v1.18.0"
+    - "Update revad image to v1.19.0"
   artifacthub.io/images: |
     - name: revad
-      image: cs3org/revad:v1.18.0
+      image: cs3org/revad:v1.19.0

From 58b2341f81fb54315becb70c9715607381dc16fa Mon Sep 17 00:00:00 2001
From: navid <navid.pdp11@gmail.com>
Date: Tue, 6 Sep 2022 12:30:26 +0430
Subject: [PATCH 16/16] resolve issues #80 , #81

---
 revad/templates/configmap.yaml |  6 +--
 revad/values.yaml              | 81 ++++++++++++++++------------------
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml
index ceac780..772c5e4 100644
--- a/revad/templates/configmap.yaml
+++ b/revad/templates/configmap.yaml
@@ -9,11 +9,11 @@ data:
 {{- $host := .Values.HostURL }}
 {{- $ocHost := .Values.OCURL }}
 {{- $secret := .Values.SharedSecret }}
-{{- $certFile := .Values.CertFile }}
-{{- $certKey := .Values.CertKey }}
 {{- $port := toString .Values.HostPort }}
+{{- $serviceName := include "revad.fullname" .  }}
+{{- $hostDomain := toString .Values.HostDomain }}
 {{- range $filename, $fileContents := .Values.configFiles }}
   {{ $filename }}: |-
-{{ $fileContents | replace "OC_URL" $ocHost | replace "SHARED_SECRET" $secret | replace "CERT_FILE" $certFile | replace "CERT_KEY" $certKey |  indent 4 }} 
+{{ $fileContents | replace "OC_URL" $ocHost | replace "SHARED_SECRET" $secret | replace "SERVICE_NAME" $serviceName | replace "HOST_DOMAIN" $hostDomain | indent 4 }} 
 {{- end }}
 {{- end }}
diff --git a/revad/values.yaml b/revad/values.yaml
index b2642f8..dcc52d6 100644
--- a/revad/values.yaml
+++ b/revad/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: cs3org/revad
-  tag: v1.18.0
+  tag: v2.7.0
   pullPolicy: Always
 
 service:
@@ -71,17 +71,19 @@ envFrom: []
 EFSS: ""
 OCURL: "oc.docker"
 SharedSecret: "123456"
-CertFile: "revaoc1.crt"
-CertKey: "revaoc1.key"
+HostDomain : "mesh.pondersource.org"
 ingress:
   enabled: false
   services:
     http:
       hostname: http.revad.local
-      path: /
-      annotations: {}
-        # kubernetes.io/ingress.class: nginx
-        # nginx.ingress.kubernetes.io/ssl-redirect: "true"
+      path: /iop(/|$)(.*)
+      annotations:
+        kubernetes.io/ingress.class: nginx
+        nginx.ingress.kubernetes.io/ssl-redirect: "true"
+        nginx.ingress.kubernetes.io/use-regex: "true"
+        nginx.ingress.kubernetes.io/rewrite-target: /$2
+        nginx.ingress.kubernetes.io/proxy-body-size: 200m
       tls: []
         # Secrets must be present in the namespace beforehand.
         # - secretName: http-revad-tls
@@ -90,10 +92,10 @@ ingress:
     grpc:
       hostname: grpc.revad.local
       path: /
-      annotations: {}
-        # kubernetes.io/ingress.class: nginx
-        # nginx.ingress.kubernetes.io/ssl-redirect: "true"
-        # nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+      annotations: 
+        kubernetes.io/ingress.class: nginx
+        nginx.ingress.kubernetes.io/ssl-redirect: "true"
+        nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
       tls: []
         # - secretName: grpc-revad-tls
         #   hosts:
@@ -124,33 +126,33 @@ configFiles:
     [http.services.ocs]
   oc.revad.toml: |
     [shared]
-    gatewaysvc = "localhost:19000"
+    gatewaysvc = "SERVICE_NAME:19000"
 
     [grpc]
     address = "0.0.0.0:19000"
 
     [grpc.services.gateway]
-    authregistrysvc = "localhost:19000"
-    appprovidersvc = "localhost:19000"
-    appregistry = "localhost:19000"
-    storageregistrysvc = "localhost:19000"
-    preferencessvc = "localhost:19000"
-    userprovidersvc = "localhost:19000"
-    usershareprovidersvc = "localhost:19000"
-    publicshareprovidersvc = "localhost:19000"
-    ocmcoresvc = "localhost:19000"
-    ocmshareprovidersvc = "localhost:19000"
-    ocminvitemanagersvc = "localhost:19000"
-    ocmproviderauthorizersvc = "localhost:19000"
+    authregistrysvc = "SERVICE_NAME:19000"
+    appprovidersvc = "SERVICE_NAME:19000"
+    appregistry = "SERVICE_NAME:19000"
+    storageregistrysvc = "SERVICE_NAME:19000"
+    preferencessvc = "SERVICE_NAME:19000"
+    userprovidersvc = "SERVICE_NAME:19000"
+    usershareprovidersvc = "SERVICE_NAME:19000"
+    publicshareprovidersvc = "SERVICE_NAME:19000"
+    ocmcoresvc = "SERVICE_NAME:19000"
+    ocmshareprovidersvc = "SERVICE_NAME:19000"
+    ocminvitemanagersvc = "SERVICE_NAME:19000"
+    ocmproviderauthorizersvc = "SERVICE_NAME:19000"
     commit_share_to_storage_grant = false
-    datagateway = "http://localhost/data"
+    datagateway = "http://HOST_DOMAIN/data"
     transfer_expires = 6 # give it a moment
 
     [grpc.services.authregistry]
     driver = "static"
 
     [grpc.services.authregistry.drivers.static.rules]
-    basic = "localhost:19000"
+    basic = "SERVICE_NAME:19000"
 
     [grpc.services.storageregistry]
     driver = "static"
@@ -185,11 +187,7 @@ configFiles:
     mock_http = false
 
     [grpc.services.ocmproviderauthorizer]
-    driver = "json"
-
-    [grpc.services.ocmproviderauthorizer.drivers.json]
-    providers = "/etc/revad/ocm-providers.json"
-    verify_request_hostname = true
+    driver = "open"
 
     [grpc.services.publicshareprovider]
     driver = "memory"
@@ -204,12 +202,12 @@ configFiles:
     driver = "static"
 
     [grpc.services.appregistry.static.rules]
-    "text/plain" = "localhost:19000"
-    "text/markdown" = "localhost:19000"
-    "application/compressed-markdown" = "localhost:19000"
-    "application/vnd.oasis.opendocument.text" = "localhost:19000"
-    "application/vnd.oasis.opendocument.spreadsheet" = "localhost:19000"
-    "application/vnd.oasis.opendocument.presentation" = "localhost:19000"
+    "text/plain" = "SERVICE_NAME:19000"
+    "text/markdown" = "SERVICE_NAME:19000"
+    "application/compressed-markdown" = "SERVICE_NAME:19000"
+    "application/vnd.oasis.opendocument.text" = "SERVICE_NAME:19000"
+    "application/vnd.oasis.opendocument.spreadsheet" = "SERVICE_NAME:19000"
+    "application/vnd.oasis.opendocument.presentation" = "SERVICE_NAME:19000"
 
     [grpc.services.storageprovider]
     driver = "nextcloud"
@@ -238,9 +236,7 @@ configFiles:
     [http]
     enabled_services = ["ocmd"]
     enabled_middlewares = ["providerauthorizer", "cors"]
-    address = "0.0.0.0:443"
-    certfile = "/etc/revad/tls/CERT_FILE"
-    keyfile = "/etc/revad/tls/CERT_KEY"
+    address = "0.0.0.0:80"
 
     [http.services.dataprovider]
     driver = "localhome"
@@ -259,10 +255,7 @@ configFiles:
     provider = "test-revaoc1"
 
     [http.middlewares.providerauthorizer]
-    driver = "json"
-
-    [http.middlewares.providerauthorizer.drivers.json]
-    providers = "/etc/revad/ocm-providers.json"
+    driver = "open"
 
     [http.services.ocs]
     prefix = "ocs"