From 43a5c258cedd24d202cefd250620fa528cd3713f Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 7 Mar 2024 12:03:36 +0545 Subject: [PATCH 1/2] chore: adjust env-var-deltas/4.0.0-5.0.0-added --- .../general-info/env-var-deltas/4.0.0-5.0.0-added.adoc | 4 ++-- .../services/general-info/env-var-deltas/4.0.0-5.0.0-added.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc index 6079015dc34..073a0cc2448 100644 --- a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc @@ -244,7 +244,7 @@ | Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares.| | | `FRONTEND_OCS_INCLUDE_OCM_SHAREES` -| nclude OCM sharees when listing sharees.| +| Include OCM sharees when listing sharees.| | | `OCIS_EVENTS_ENDPOINT` + `FRONTEND_EVENTS_ENDPOINT` @@ -497,7 +497,7 @@ | Disable TLS certificate validation for the OCM connections. Do not set this in production environments.| | | `OCM_WEBAPP_TEMPLATE` -| 'Template for the webapp url.| +| Template for the webapp url.| | | `OCM_OCM_SHAREPROVIDER_JSON_FILE` | Path to the JSON file where OCM share data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage.| diff --git a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md index e7a68514f6a..a699e76676e 100644 --- a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md @@ -132,7 +132,7 @@ | | `OCM_OCM_CORE_JSON_FILE` | Path to the JSON file where OCM share data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage. | | | | `OCM_OCM_SHARE_PROVIDER_DRIVER` | Driver to be used to persist ocm shares. Supported value is only 'json'. | `json` | | | `OCM_OCM_SHARE_PROVIDER_INSECURE` | Disable TLS certificate validation for the OCM connections. Do not set this in production environments. | | -| | `OCM_WEBAPP_TEMPLATE` | 'Template for the webapp url. | | +| | `OCM_WEBAPP_TEMPLATE` | Template for the webapp url. | | | | `OCM_OCM_SHAREPROVIDER_JSON_FILE` | Path to the JSON file where OCM share data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage. | | | services/ocm/pkg/config/debug.go | `OCM_DEBUG_ADDR` | Bind address of the debug server, where metrics, health, config and debug endpoints will be exposed. | | | | `OCM_DEBUG_TOKEN` | Token to secure the metrics endpoint. | | From 1d23a030a5e4114936f850189e66dcce50e6b04a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 7 Mar 2024 12:47:45 +0545 Subject: [PATCH 2/2] chore: remove duplicate FRONTEND_OCS_STAT_CACHE_AUTH_USERNAME from docs --- .../general-info/env-var-deltas/4.0.0-5.0.0-added.adoc | 4 ---- .../services/general-info/env-var-deltas/4.0.0-5.0.0-added.md | 1 - 2 files changed, 5 deletions(-) diff --git a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc index 073a0cc2448..dd7f27a2959 100644 --- a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc @@ -262,10 +262,6 @@ `OCS_EVENTS_TLS_ROOT_CA_CERTIFICATE` | The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false.| | -| `OCIS_CACHE_AUTH_USERNAME` + -`FRONTEND_OCS_STAT_CACHE_AUTH_USERNAME` -| The username to use for authentication. Only applies when using the 'nats-js-kv' store type.| -| | `OCIS_EVENTS_ENABLE_TLS` + `FRONTEND_EVENTS_ENABLE_TLS` | Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services.| diff --git a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md index a699e76676e..3e273a99a47 100644 --- a/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md @@ -69,7 +69,6 @@ | | `OCIS_EVENTS_CLUSTER;FRONTEND_EVENTS_CLUSTER` | The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system. | | | | `OCIS_INSECURE;FRONTEND_EVENTS_TLS_INSECURE` | Whether to verify the server TLS certificates. | | | | `FRONTEND_EVENTS_TLS_ROOT_CA_CERTIFICATE;OCS_EVENTS_TLS_ROOT_CA_CERTIFICATE` | The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false. | | -| | `OCIS_CACHE_AUTH_USERNAME;FRONTEND_OCS_STAT_CACHE_AUTH_USERNAME` | The username to use for authentication. Only applies when using the 'nats-js-kv' store type. | | | | `OCIS_EVENTS_ENABLE_TLS;FRONTEND_EVENTS_ENABLE_TLS` | Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services. | | | | `OCIS_EVENTS_AUTH_USERNAME;FRONTEND_EVENTS_AUTH_USERNAME` | The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.. | | | | `OCIS_EVENTS_AUTH_PASSWORD;FRONTEND_EVENTS_AUTH_PASSWORD` | The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.. | |