Skip to content

Commit

Permalink
Merge pull request #7554 from kobergj/AllowDefiningStorageRegistryByEnv
Browse files Browse the repository at this point in the history
Allow configuring storage registry with envvars
  • Loading branch information
kobergj committed Oct 20, 2023
1 parent 39f24d3 commit c907102
Show file tree
Hide file tree
Showing 84 changed files with 132 additions and 102 deletions.
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.eventhistory.v0"
url: /apis/grpc_apis/ocis_messages_eventhistory_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.policies.v0"
url: /apis/grpc_apis/ocis_messages_policies_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.search.v0"
url: /apis/grpc_apis/ocis_messages_search_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.settings.v0"
url: /apis/grpc_apis/ocis_messages_settings_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.store.v0"
url: /apis/grpc_apis/ocis_messages_store_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.thumbnails.v0"
url: /apis/grpc_apis/ocis_messages_thumbnails_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.eventhistory.v0"
url: /apis/grpc_apis/ocis_services_eventhistory_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.policies.v0"
url: /apis/grpc_apis/ocis_services_policies_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.search.v0"
url: /apis/grpc_apis/ocis_services_search_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.settings.v0"
url: /apis/grpc_apis/ocis_services_settings_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.store.v0"
url: /apis/grpc_apis/ocis_services_store_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.thumbnails.v0"
url: /apis/grpc_apis/ocis_services_thumbnails_v0
date: 2023-10-20T11:15:54Z
date: 2023-10-20T14:18:17Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/antivirus_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the antivirus service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-provider_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the app-provider service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-registry_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the app-registry service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/audit_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the audit service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/auth-basic_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the auth-basic service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -263,7 +263,7 @@ LDAP DN to use for simple bind authentication with the target LDAP server.
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`AUTH_BASIC_LDAP_BIND_PASSWORD` +
xref:deprecation-note-2023-10-20-11-16-12[Deprecation Note]
xref:deprecation-note-2023-10-20-14-18-35[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-bearer_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the auth-bearer service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-machine_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the auth-machine service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-service_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the auth-service service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/clientlog_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the clientlog service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/eventhistory_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the eventhistory service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/frontend_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the frontend service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
29 changes: 28 additions & 1 deletion services/_includes/adoc/gateway_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the gateway service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -408,6 +408,33 @@ a| [subs=-attributes]
a| [subs=-attributes]
The public facing URL of the oCIS frontend.

a|`GATEWAY_STORAGE_REGISTRY_DRIVER` +

a| [subs=-attributes]
++string ++
a| [subs=-attributes]
++spaces ++
a| [subs=-attributes]
The driver name of the storage registry to use.

a|`GATEWAY_STORAGE_REGISTRY_RULES` +

a| [subs=-attributes]
++[]string ++
a| [subs=-attributes]
++[] ++
a| [subs=-attributes]
The rules for the storage registry.

a|`GATEWAY_STORAGE_REGISTRY_CONFIG_JSON` +

a| [subs=-attributes]
++string ++
a| [subs=-attributes]
++ ++
a| [subs=-attributes]
Additional configuration for the storage registry in json format.

a|`GATEWAY_STORAGE_USERS_MOUNT_ID` +

a| [subs=-attributes]
Expand Down
24 changes: 12 additions & 12 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Flag to enable or disable the creation of the demo users.
The default role assignments the demo users should be setup.

a| `LDAP_BIND_PASSWORD`

Expand Down Expand Up @@ -129,7 +129,7 @@ a| [subs=-attributes]
++0 ++

a| [subs=-attributes]
Max number of entries to hold in the cache.
The maximum quantity of items in the store. Only applies when store type 'ocmem' is configured. Defaults to 512.

a| `OCIS_CACHE_STORE`

Expand All @@ -150,7 +150,7 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++noop ++
++memory ++

a| [subs=-attributes]
The type of the cache store. Supported values are: 'memory', 'ocmem', 'etcd', 'redis', 'redis-sentinel', 'nats-js', 'noop'. See the text description for details.
Expand Down Expand Up @@ -198,10 +198,10 @@ a| [subs=-attributes]
++Duration ++

a| [subs=-attributes]
++5m0s ++
++336h0m0s ++

a| [subs=-attributes]
Default time to live for user info in the cache. Only applied when access tokens has no expiration. The duration can be set as number followed by a unit identifier like s, m or h. Defaults to '300s' (300 seconds).
Time to live for cache records in the graph. The duration can be set as number followed by a unit identifier like s, m or h. Defaults to '336h' (2 weeks).

a| `OCIS_CORS_ALLOW_CREDENTIALS`

Expand Down Expand Up @@ -246,7 +246,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Cache-Control] ++
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Ocs-Apirequest] ++

a| [subs=-attributes]
A blank or comma-separated list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers.
Expand All @@ -270,7 +270,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[GET POST PUT PATCH DELETE OPTIONS] ++
++[GET] ++

a| [subs=-attributes]
A comma-separated list of allowed CORS methods. See following chapter for more details: *Access-Control-Request-Method* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Method
Expand Down Expand Up @@ -428,7 +428,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services.
Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services..

a| `OCIS_EVENTS_ENDPOINT`

Expand Down Expand Up @@ -481,7 +481,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The root CA certificate used to validate the server's TLS certificate. If provided SEARCH_EVENTS_TLS_INSECURE will be seen as false.
The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false.

a| `OCIS_GRPC_CLIENT_TLS_CACERT`

Expand Down Expand Up @@ -726,7 +726,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The client ID to authenticate with keycloak.
The client id to authenticate with keycloak.

a| `OCIS_KEYCLOAK_CLIENT_REALM`

Expand Down Expand Up @@ -1508,7 +1508,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The machine auth API key used to validate internal requests necessary to access resources from other services.
Machine auth API key used to validate internal requests necessary for the access to resources from other services.

a| `OCIS_OIDC_ISSUER`

Expand Down Expand Up @@ -1986,7 +1986,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
Transfer secret for signing file up- and download requests.
The storage transfer secret.

a| `OCIS_TRANSLATION_PATH`

Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/graph_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the graph service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -488,7 +488,7 @@ LDAP DN to use for simple bind authentication with the target LDAP server.
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`GRAPH_LDAP_BIND_PASSWORD` +
xref:deprecation-note-2023-10-20-11-16-12[Deprecation Note]
xref:deprecation-note-2023-10-20-14-18-35[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/groups_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-10-20-11-16-12]
[#deprecation-note-2023-10-20-14-18-35]
[caption=]
.Deprecation notes for the groups service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -263,7 +263,7 @@ LDAP DN to use for simple bind authentication with the target LDAP server.
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`GROUPS_LDAP_BIND_PASSWORD` +
xref:deprecation-note-2023-10-20-11-16-12[Deprecation Note]
xref:deprecation-note-2023-10-20-14-18-35[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
Loading

0 comments on commit c907102

Please sign in to comment.