Merge branch 'master' into update-ocis-accounts

CHANGELOG.md

@@ -14,6 +14,7 @@
 * Change - Make ocis-settings available: [#287](https://github.com/owncloud/ocis/pull/287)
 * Change - Update ocis-settings to v0.2.0: [#467](https://github.com/owncloud/ocis/pull/467)
 * Change - Start ocis-proxy with the ocis server command: [#119](https://github.com/owncloud/ocis/issues/119)
+* Change - Update ocis-proxy to v0.7.0: [#476](https://github.com/owncloud/ocis/pull/476)
 * Change - Update reva config: [#336](https://github.com/owncloud/ocis/pull/336)
 * Enhancement - Document how to run OCIS on top of EOS: [#172](https://github.com/owncloud/ocis/pull/172)
 * Enhancement - Simplify tracing config: [#92](https://github.com/owncloud/product/issues/92)
@@ -129,6 +130,13 @@
    https://github.com/owncloud/ocis/issues/136
 
 
+* Change - Update ocis-proxy to v0.7.0: [#476](https://github.com/owncloud/ocis/pull/476)
+
+   This version delivers ocis-proxy v0.7.0.
+
+   https://github.com/owncloud/ocis/pull/476
+
+
 * Change - Update reva config: [#336](https://github.com/owncloud/ocis/pull/336)
 
    - EOS homes are not configured with an enable-flag anymore, but with a dedicated storage

changelog/unreleased/update-ocis-proxy.md

@@ -0,0 +1,5 @@
+Change: Update ocis-proxy to v0.7.0
+
+This version delivers ocis-proxy v0.7.0.
+
+https://github.com/owncloud/ocis/pull/476

docs/basic-remote-setup.md

@@ -11,7 +11,7 @@ geekdocFilePath: basic-remote-setup.md
 
 Out of the box the ocis single binary and the `owncloud/ocis` docker image are configured to run on localhost for quick testing and development.
 
-If you need to access ocis on a VM or a remote machine e.g when testing a mobile client you need to configure ocis to run on a different host.
+If you need to access ocis on a VM or a remote machine e.g. when testing a mobile client you need to configure ocis to run on a different host.
 
 ## Use the binary
 
@@ -19,12 +19,12 @@ If you start the ocis fullstack for the first time with `./bin/ocis server` it w
 
 {{< hint warning >}}
 **Outdated version**\
-This file `identifier-registration.yml` will only be generated if there is no such file in place. You could miss updates on this file.
+The `identifier-registration.yml` file will only be generated if there is no such file in place. You could miss updates on this file. Run `make clean` to delete the file and keep the development environment tidy otherwise as well.
 {{< /hint >}}
 
 ### Add your hostname to the idp config
 
-Let us assume `your-host` is your remote domain name or IP adress. In this example we do not change the default port (`9200`). But this could be changed to another port.
+Let us assume `your-host` is your remote domain name or IP adress. Add your host to the `identifier-registration.yml` like this:
 
 ```yaml {linenos=table,hl_lines=["15-17",21]}
 # OpenID Connect client registry.
@@ -50,9 +50,11 @@ clients:
       - https://your-server:9200
 ```
 
+In this example we do not change the default port (`9200`). But this could be changed to another port.
+
 ### Start the ocis fullstack server
 
-You need to configure `your-host` in some services to provide the needed public resources. oCIS currently needs a running Redis Server reachable locally on the machine at the default port (`localhost:6379`). You can change this using the following option `REVA_STORAGE_OWNCLOUD_REDIS_ADDR=some-host:6379`.
+You need to configure `your-host` in some services to provide the needed public resources. When using the owncloud storage driver (which is the default) oCIS currently needs a running Redis Server reachable locally on the machine at the default port (`localhost:6379`). You can change this using the following option `REVA_STORAGE_OWNCLOUD_REDIS_ADDR=some-host:6379`.
 
 ```bash
 PROXY_HTTP_ADDR=0.0.0.0:9200 \
@@ -72,7 +74,7 @@ KONNECTD_TLS=0 \
 For more configuration options check the configuration secion in [ocis](https://owncloud.github.io/ocis/configuration/) and every ocis extension.
 
 {{< hint info >}}
-**TlS Certificate**\
+**TLS Certificate**\
 In this example, we are replacing the default self signed cert with a CA signed one to avoid the certificate warning when accessing the login page.
 {{< /hint >}}
 

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/owncloud/ocis-ocs v0.2.0
 	github.com/owncloud/ocis-phoenix v0.12.0
 	github.com/owncloud/ocis-pkg/v2 v2.3.0
-	github.com/owncloud/ocis-proxy v0.6.1-0.20200819105709-a51b3c8ed42f
+	github.com/owncloud/ocis-proxy v0.7.0
 	github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27
 	github.com/owncloud/ocis-settings v0.2.0
 	github.com/owncloud/ocis-store v0.1.1

go.sum

@@ -1285,6 +1285,8 @@ github.com/owncloud/ocis-pkg/v2 v2.3.0 h1:bdDgfPkPdL3D6bGKhQ56pfwT1XdiKBtQ34qErV
 github.com/owncloud/ocis-pkg/v2 v2.3.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE=
 github.com/owncloud/ocis-proxy v0.6.1-0.20200819105709-a51b3c8ed42f h1:qY8fwArWIBuIFT4QBYQgpupUSGtvuVGT8QSIOF1R0qg=
 github.com/owncloud/ocis-proxy v0.6.1-0.20200819105709-a51b3c8ed42f/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY=
+github.com/owncloud/ocis-proxy v0.7.0 h1:ruOOz0Ed4crtkjqFRvvbgywUfDldcWDxOqbUQlwthTU=
+github.com/owncloud/ocis-proxy v0.7.0/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY=
 github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27 h1:LupXoJXY0cK33+8s6bBA3M8g4J2kv6YHBY7szyPIsHI=
 github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27/go.mod h1:mZpI9axqlcOy8rk19JicZFGUIVB8VxD/0VLiIJxi6GE=
 github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU=