From 1faa36f30305c765e7727854fa51b598beb03563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 14 Aug 2024 21:53:55 +0200 Subject: [PATCH] add ocm wellknown config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/add-ocm-wellknown-config.md | 5 +++++ services/ocm/pkg/revaconfig/config.go | 12 ++++++++++++ services/proxy/pkg/config/defaults/defaultconfig.go | 5 +++++ 3 files changed, 22 insertions(+) create mode 100644 changelog/unreleased/add-ocm-wellknown-config.md diff --git a/changelog/unreleased/add-ocm-wellknown-config.md b/changelog/unreleased/add-ocm-wellknown-config.md new file mode 100644 index 0000000000..9478e933dc --- /dev/null +++ b/changelog/unreleased/add-ocm-wellknown-config.md @@ -0,0 +1,5 @@ +Enhancement: Add OCM wellknown configuration + +We now configure the `wellknown` service for OCM. + +https://github.com/owncloud/ocis/pull/9815 diff --git a/services/ocm/pkg/revaconfig/config.go b/services/ocm/pkg/revaconfig/config.go index 2d2f697765..b8f4a15b21 100644 --- a/services/ocm/pkg/revaconfig/config.go +++ b/services/ocm/pkg/revaconfig/config.go @@ -41,6 +41,18 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter }, // TODO build services dynamically "services": map[string]interface{}{ + "wellknown": map[string]interface{}{ + "prefix": ".well-known", + "ocmprovider": map[string]interface{}{ + "ocm_prefix": cfg.OCMD.Prefix, + "endpoint": cfg.Commons.OcisURL, + "provider": "oCIS", + "webdav_root": "/dav/ocm", + "webapp_root": cfg.ScienceMesh.Prefix, + "enable_webapp": false, + "enable_datatx": false, + }, + }, "sciencemesh": map[string]interface{}{ "prefix": cfg.ScienceMesh.Prefix, "smtp_credentials": map[string]string{}, diff --git a/services/proxy/pkg/config/defaults/defaultconfig.go b/services/proxy/pkg/config/defaults/defaultconfig.go index 40253045e5..ee93f7d562 100644 --- a/services/proxy/pkg/config/defaults/defaultconfig.go +++ b/services/proxy/pkg/config/defaults/defaultconfig.go @@ -112,6 +112,11 @@ func DefaultPolicies() []config.Policy { Service: "com.owncloud.web.web", Unprotected: true, }, + { + Endpoint: "/.well-known/ocm", + Service: "com.owncloud.web.ocm", + Unprotected: true, + }, { Endpoint: "/.well-known/webfinger", Service: "com.owncloud.web.webfinger",