From cc4fb39e67546b0fe3760f1b02efaa6c56c0d721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 11 May 2020 09:24:52 +0200 Subject: [PATCH 1/4] minor review --- docs/basic-remote-setup.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/basic-remote-setup.md b/docs/basic-remote-setup.md index 3fbfbc212..ffaae6d2f 100644 --- a/docs/basic-remote-setup.md +++ b/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 >}} From 982ebdcbb4a30005c20ccbd9abd233d88d0fe216 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Fri, 21 Aug 2020 14:05:39 +0200 Subject: [PATCH 2/4] update ocis-proxy to v0.7.0 Signed-off-by: David Christofas --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 67c465c51..d5095f9d7 100644 --- a/go.mod +++ b/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 @@ -43,6 +43,7 @@ require ( go.opencensus.io v0.22.4 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9 // indirect golang.org/x/text v0.3.3 // indirect diff --git a/go.sum b/go.sum index a35a41eac..89b6d4cf4 100644 --- a/go.sum +++ b/go.sum @@ -1283,6 +1283,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= @@ -1702,6 +1704,8 @@ golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From c37787bdbf9e3225834235c02efb753ee67d080e Mon Sep 17 00:00:00 2001 From: David Christofas Date: Fri, 21 Aug 2020 14:11:15 +0200 Subject: [PATCH 3/4] add changelog Signed-off-by: David Christofas --- changelog/unreleased/update-ocis-proxy.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/update-ocis-proxy.md diff --git a/changelog/unreleased/update-ocis-proxy.md b/changelog/unreleased/update-ocis-proxy.md new file mode 100644 index 000000000..7cdee7b0d --- /dev/null +++ b/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 From 8e454ef9af88f384169dcdf581482a963c8edf0b Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 21 Aug 2020 16:22:50 +0000 Subject: [PATCH 4/4] Automated changelog update [skip ci] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a85f8ae4..b244cc303 100644 --- a/CHANGELOG.md +++ b/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