From 1581b0f6b416f3812574597b5ee81acfaffc1537 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 28 Aug 2020 15:22:46 +0200 Subject: [PATCH 1/2] Add ocis-hello endpoints to builtin and example config --- config/proxy-example.json | 8 ++++++++ pkg/proxy/proxy.go | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/config/proxy-example.json b/config/proxy-example.json index 68c2fe3..ed7c1a6 100644 --- a/config/proxy-example.json +++ b/config/proxy-example.json @@ -79,6 +79,14 @@ { "endpoint": "/settings.js", "backend": "http://localhost:9190" + }, + { + "endpoint": "/api/v0/greet", + "backend": "http://localhost:9105" + }, + { + "endpoint": "/hello.js", + "backend": "http://localhost:9105" } ] }, diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go index a489bae..6c22cb7 100644 --- a/pkg/proxy/proxy.go +++ b/pkg/proxy/proxy.go @@ -305,6 +305,14 @@ func defaultPolicies() []config.Policy { Endpoint: "/settings.js", Backend: "http://localhost:9190", }, + { + Endpoint: "/api/v0/greet", + Backend: "http://localhost:9105", + }, + { + Endpoint: "/hello.js", + Backend: "http://localhost:9105", + }, }, }, { From 3cbba6dcba4af3f2295791c70ab5245e5cfc4d87 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 28 Aug 2020 15:30:14 +0200 Subject: [PATCH 2/2] Add changelog --- changelog/unreleased/hello-in-example-config.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/hello-in-example-config.md diff --git a/changelog/unreleased/hello-in-example-config.md b/changelog/unreleased/hello-in-example-config.md new file mode 100644 index 0000000..e57f722 --- /dev/null +++ b/changelog/unreleased/hello-in-example-config.md @@ -0,0 +1,5 @@ +Enhancement: Add hello API and app endpoints to example config and builtin config + +We added the ocis-hello API and app endpoints to both the example config and the builtin config. + +https://github.com/owncloud/ocis-proxy/pull/96