From 75e770956be5ede3977ffaa45105a8b405ed6acb Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 18 May 2022 15:21:09 +0200 Subject: [PATCH 1/4] update port ranges --- docs/extensions/port-ranges.md | 59 +++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/docs/extensions/port-ranges.md b/docs/extensions/port-ranges.md index 7a0aa7d0dd..0889b8a8d5 100644 --- a/docs/extensions/port-ranges.md +++ b/docs/extensions/port-ranges.md @@ -19,36 +19,49 @@ If you're developing a non-public extension, we recommend using ports outside of We also suggest to use the last port in your extensions' range as a debug/metrics port. - ## Allocations | Port range | Service | | ---------- | ----------------------------------------------------------------------------- | -| 9000-9010 | [ocis](https://github.com/owncloud/ocis) | -| 9100-9104 | [web](https://github.com/owncloud/ocis/tree/master/web) | +| 9000-9010 | [reserved for oCIS]({{< ref "../../../ocis/_index.md" >}}) | +| 9100-9104 | [web]({{< ref "./web/_index.md" >}}) | | 9105-9109 | [hello](https://github.com/owncloud/ocis-hello) | -| 9110-9114 | [ocs](https://github.com/owncloud/ocis/tree/master/ocs) | -| 9115-9119 | [webdav](https://github.com/owncloud/ocis/tree/master/webdav) | -| 9120-9124 | [graph](https://github.com/owncloud/ocis/tree/master/graph) | +| 9110-9114 | [ocs]({{< ref "./ocs/_index.md" >}}) | +| 9115-9119 | [webdav]({{< ref "./webdav/_index.md" >}}) | +| 9120-9124 | [graph]({{< ref "./graph/_index.md" >}}) | | 9125-9129 | FREE (formerly used by glauth) | -| 9130-9134 | [konnectd](https://github.com/owncloud/ocis/tree/master/konnectd) | -| 9135-9139 | [graph-explorer](https://github.com/owncloud/ocis/tree/master/graph-explorer) | -| 9140-9179 | [reva/storage](https://github.com/owncloud/ocis/tree/master/storage) | +| 9130-9134 | [idp]({{< ref "./idp/_index.md" >}}) | +| 9135-9139 | [graph-explorer]({{< ref "./graph-explorer/_index.md" >}}) | +| 9140-9141 | [frontend]({{< ref "./frontend/_index.md" >}}) | +| 9142-9143 | [gateway]({{< ref "./gateway/_index.md" >}}) | +| 9144-9145 | [users]({{< ref "./users/_index.md" >}}) | +| 9146-9147 | [auth-basic]({{< ref "./auth-basic/_index.md" >}}) | +| 9148-9149 | [auth-bearer]({{< ref "./auth-bearer/_index.md" >}}) | +| 9150-9153 | [sharing]({{< ref "./sharing/_index.md" >}}) | +| 9154-9156 | [storage-shares]({{< ref "./storage-shares/_index.md" >}}) | +| 9157-9159 | [storage-users]({{< ref "./storage-users/_index.md" >}}) | +| 9160-9162 | [groups]({{< ref "./groups/_index.md" >}}) | +| 9163 | [ocdav]({{< ref "./ocdav/_index.md" >}}) | +| 9164 | [groups]({{< ref "./groups/_index.md" >}}) | +| 9165 | [app-provider]({{< ref "./app-provider/_index.md" >}}) | +| 9166-9169 | [auth-machine]({{< ref "./auth-machine/_index.md" >}}) | +| 9170-9174 | [notifications]({{< ref "./notifications/_index.md" >}}) | +| 9175-9179 | [storage-publiclink]({{< ref "./storage-publiclink/_index.md" >}}) | | 9180-9184 | FREE (formerly used by accounts) | -| 9185-9189 | [thumbnails](https://github.com/owncloud/ocis/tree/master/thumbnails) | -| 9190-9194 | [settings](https://github.com/owncloud/ocis/tree/master/settings) | -| 9195-9199 | [store](https://github.com/owncloud/ocis/tree/master/store) | -| 9200-9204 | [proxy](https://github.com/owncloud/ocis/tree/master/proxy) | -| 9205-9209 | [markdown-editor](https://github.com/owncloud/ocis-markdown-editor) | -| 9210-9214 | [reva](https://github.com/owncloud/ocis-reva) unused? | -| 9215-9219 | reva metadata storage | -| 9220-9224 | search | -| 9225-9229 | photoprism (state: PoC) | -| 9230-9234 | [nats](https://github.com/owncloud/ocis/tree/master/nats) | -| 9235-9239 | [idm](https://github.com/owncloud/ocis/tree/master/proxy) | -| 9240-9244 | [app-registry](https://github.com/owncloud/ocis/tree/master/extensions/app-registry) | +| 9185-9189 | [thumbnails]({{< ref "./thumbnails/_index.md" >}}) | +| 9190-9194 | [settings]({{< ref "./settings/_index.md" >}}) | +| 9195-9199 | FREE | +| 9200-9204 | [proxy]({{< ref "./proxy/_index.md" >}}) | +| 9205-9209 | [proxy]({{< ref "./proxy/_index.md" >}}) | +| 9210-9214 | FREE | +| 9215-9219 | [storage-system]({{< ref "./storage-system/_index.md" >}}) | +| 9220-9224 | [search]({{< ref "./search/_index.md" >}}) | +| 9225-9229 | FREE | +| 9230-9234 | [nats]({{< ref "./nats/_index.md" >}}) | +| 9235-9239 | [idm]({{< ref "./idm/_index.md" >}}) | +| 9240-9244 | [app-registry]({{< ref "./app-registry/_index.md" >}}) | | 9245-9249 | FREE | -| 9250-9254 | oCIS Runtime | +| 9250-9254 | [oCIS runtime](https://github.com/owncloud/ocis/tree/master/ocis/pkg/runtime) | | 9255-9259 | FREE | | 9260-9264 | FREE | | 9265-9269 | FREE | @@ -90,7 +103,7 @@ We also suggest to use the last port in your extensions' range as a debug/metric | 9445-9449 | FREE | | 9450-9454 | FREE | | 9455-9459 | FREE | -| 9460-9464 | FREE | +| 9460-9464 | [store]({{< ref "./store/_index.md" >}}) | | 9465-9469 | FREE | | 9470-9474 | FREE | | 9475-9479 | FREE | From ba120b61ef240bd92e0ca1dad79de9f9314040f2 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 18 May 2022 15:24:39 +0200 Subject: [PATCH 2/4] expose debug server for missing extensions --- changelog/unreleased/fix-debug-config-enable-by-default.md | 6 ++++++ extensions/audit/pkg/config/defaults/defaultconfig.go | 3 +++ extensions/idm/pkg/config/defaults/defaultconfig.go | 3 +++ extensions/nats/pkg/config/defaults/defaultconfig.go | 3 +++ .../notifications/pkg/config/defaults/defaultconfig.go | 3 +++ 5 files changed, 18 insertions(+) create mode 100644 changelog/unreleased/fix-debug-config-enable-by-default.md diff --git a/changelog/unreleased/fix-debug-config-enable-by-default.md b/changelog/unreleased/fix-debug-config-enable-by-default.md new file mode 100644 index 0000000000..b23f825756 --- /dev/null +++ b/changelog/unreleased/fix-debug-config-enable-by-default.md @@ -0,0 +1,6 @@ +Bugfix: Enable debug server by default + +We've fixed the behavior for th audit, idm, nats and notifications extensions, that +did not start their debug server by default. + +https://github.com/owncloud/ocis/pull/3827 diff --git a/extensions/audit/pkg/config/defaults/defaultconfig.go b/extensions/audit/pkg/config/defaults/defaultconfig.go index bf732d98ce..d2db3f7f40 100644 --- a/extensions/audit/pkg/config/defaults/defaultconfig.go +++ b/extensions/audit/pkg/config/defaults/defaultconfig.go @@ -13,6 +13,9 @@ func FullDefaultConfig() *config.Config { func DefaultConfig() *config.Config { return &config.Config{ + Debug: config.Debug{ + Addr: "127.0.0.1:9234", + }, Service: config.Service{ Name: "audit", }, diff --git a/extensions/idm/pkg/config/defaults/defaultconfig.go b/extensions/idm/pkg/config/defaults/defaultconfig.go index 99374a1f68..985ec60cec 100644 --- a/extensions/idm/pkg/config/defaults/defaultconfig.go +++ b/extensions/idm/pkg/config/defaults/defaultconfig.go @@ -16,6 +16,9 @@ func FullDefaultConfig() *config.Config { func DefaultConfig() *config.Config { return &config.Config{ + Debug: config.Debug{ + Addr: "127.0.0.1:9239", + }, Service: config.Service{ Name: "idm", }, diff --git a/extensions/nats/pkg/config/defaults/defaultconfig.go b/extensions/nats/pkg/config/defaults/defaultconfig.go index 6b33c9cded..1766572423 100644 --- a/extensions/nats/pkg/config/defaults/defaultconfig.go +++ b/extensions/nats/pkg/config/defaults/defaultconfig.go @@ -19,6 +19,9 @@ func FullDefaultConfig() *config.Config { func DefaultConfig() *config.Config { return &config.Config{ + Debug: config.Debug{ + Addr: "127.0.0.1:9234", + }, Service: config.Service{ Name: "nats", }, diff --git a/extensions/notifications/pkg/config/defaults/defaultconfig.go b/extensions/notifications/pkg/config/defaults/defaultconfig.go index 2234e3843b..5f29ea9278 100644 --- a/extensions/notifications/pkg/config/defaults/defaultconfig.go +++ b/extensions/notifications/pkg/config/defaults/defaultconfig.go @@ -16,6 +16,9 @@ func FullDefaultConfig() *config.Config { func DefaultConfig() *config.Config { return &config.Config{ + Debug: config.Debug{ + Addr: "127.0.0.1:9174", + }, Service: config.Service{ Name: "notifications", }, From b38a7d1dccd0abda4df7b6a25ba32a1f25213103 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 18 May 2022 15:54:36 +0200 Subject: [PATCH 3/4] Update changelog/unreleased/fix-debug-config-enable-by-default.md --- changelog/unreleased/fix-debug-config-enable-by-default.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/fix-debug-config-enable-by-default.md b/changelog/unreleased/fix-debug-config-enable-by-default.md index b23f825756..916a439206 100644 --- a/changelog/unreleased/fix-debug-config-enable-by-default.md +++ b/changelog/unreleased/fix-debug-config-enable-by-default.md @@ -1,6 +1,6 @@ Bugfix: Enable debug server by default -We've fixed the behavior for th audit, idm, nats and notifications extensions, that +We've fixed the behavior for the audit, idm, nats and notifications extensions, that did not start their debug server by default. https://github.com/owncloud/ocis/pull/3827 From 69585331e22ccbd9caeebcad9dd0caee7ab76927 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 18 May 2022 15:59:40 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- docs/extensions/port-ranges.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/extensions/port-ranges.md b/docs/extensions/port-ranges.md index 0889b8a8d5..ccfc53c304 100644 --- a/docs/extensions/port-ranges.md +++ b/docs/extensions/port-ranges.md @@ -23,7 +23,7 @@ We also suggest to use the last port in your extensions' range as a debug/metric | Port range | Service | | ---------- | ----------------------------------------------------------------------------- | -| 9000-9010 | [reserved for oCIS]({{< ref "../../../ocis/_index.md" >}}) | +| 9000-9010 | [reserved for Infinite Scale]({{< ref "../../../ocis/_index.md" >}}) | | 9100-9104 | [web]({{< ref "./web/_index.md" >}}) | | 9105-9109 | [hello](https://github.com/owncloud/ocis-hello) | | 9110-9114 | [ocs]({{< ref "./ocs/_index.md" >}}) | @@ -61,7 +61,7 @@ We also suggest to use the last port in your extensions' range as a debug/metric | 9235-9239 | [idm]({{< ref "./idm/_index.md" >}}) | | 9240-9244 | [app-registry]({{< ref "./app-registry/_index.md" >}}) | | 9245-9249 | FREE | -| 9250-9254 | [oCIS runtime](https://github.com/owncloud/ocis/tree/master/ocis/pkg/runtime) | +| 9250-9254 | [ocis server (runtime)](https://github.com/owncloud/ocis/tree/master/ocis/pkg/runtime) | | 9255-9259 | FREE | | 9260-9264 | FREE | | 9265-9269 | FREE |