mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-20 03:48:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert two files and rebase

Browse Source
This commit is contained in:
Martin Mattel
2024-10-02 09:11:04 +02:00
parent 0d719a7c72
commit fd85e78af7
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/helpers/env_vars.yaml
+37 -37
View File
@@ -1589,7 +1589,7 @@ AUTH_BASIC_LDAP_CACERT:
type: string
description: Path/File name for the root CA certificate (in PEM format) used to
validate TLS server certificates of the LDAP service. If not defined, the root
directory derives from $OCIS_BASE_DATA_PATH/idm.
directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -5079,7 +5079,7 @@ GRAPH_LDAP_CACERT:
type: string
description: Path/File name for the root CA certificate (in PEM format) used to
validate TLS server certificates of the LDAP service. If not defined, the root
directory derives from $OCIS_BASE_DATA_PATH/idm.
directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -5713,7 +5713,7 @@ GROUPS_LDAP_CACERT:
type: string
description: Path/File name for the root CA certificate (in PEM format) used to
validate TLS server certificates of the LDAP service. If not defined, the root
directory derives from $OCIS_BASE_DATA_PATH/idm.
directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6144,7 +6144,7 @@ IDM_DATABASE_PATH:
defaultValue: /var/lib/ocis/idm/ocis.boltdb
type: string
description: Full path to the IDM backend database. If not defined, the root directory
derives from $OCIS_BASE_DATA_PATH/idm.
derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6211,7 +6211,7 @@ IDM_LDAPS_CERT:
defaultValue: /var/lib/ocis/idm/ldap.crt
type: string
description: File name of the TLS server certificate for the LDAPS listener. If
not defined, the root directory derives from $OCIS_BASE_DATA_PATH/idm.
not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6221,7 +6221,7 @@ IDM_LDAPS_KEY:
defaultValue: /var/lib/ocis/idm/ldap.key
type: string
description: File name for the TLS certificate key for the server certificate. If
not defined, the root directory derives from $OCIS_BASE_DATA_PATH/idm.
not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6412,7 +6412,7 @@ IDP_ENCRYPTION_SECRET_FILE:
type: string
description: Path to the encryption secret file, if unset, a new certificate will
be autogenerated upon each restart, thus invalidating all existing sessions. If
not defined, the root directory derives from $OCIS_BASE_DATA_PATH/idp.
not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/idp.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6571,7 +6571,7 @@ IDP_LDAP_TLS_CACERT:
type: string
description: Path/File name for the root CA certificate (in PEM format) used to
validate TLS server certificates of the LDAP service. If not defined, the root
directory derives from $OCIS_BASE_DATA_PATH/idp.
directory derives from $OCIS_BASE_DATA_PATH:/idp.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6721,7 +6721,7 @@ IDP_SIGNING_PRIVATE_KEY_FILES:
defaultValue: '[/var/lib/ocis/idp/private-key.pem]'
type: '[]string'
description: A list of private key files for signing IDP requests. If not defined,
the root directory derives from $OCIS_BASE_DATA_PATH/idp. See the Environment
the root directory derives from $OCIS_BASE_DATA_PATH:/idp. See the Environment
Variable Types description for more details.
introductionVersion: pre5.0
deprecationVersion: ""
@@ -6781,7 +6781,7 @@ IDP_TRANSPORT_TLS_CERT:
defaultValue: /var/lib/ocis/idp/server.crt
type: string
description: Path/File name of the TLS server certificate (in PEM format) for the
IDP service. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/idp.
IDP service. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/idp.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -6792,7 +6792,7 @@ IDP_TRANSPORT_TLS_KEY:
type: string
description: Path/File name for the TLS certificate key (in PEM format) for the
server certificate to use for the IDP service. If not defined, the root directory
derives from $OCIS_BASE_DATA_PATH/idp.
derives from $OCIS_BASE_DATA_PATH:/idp.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -7221,7 +7221,7 @@ NATS_NATS_STORE_DIR:
defaultValue: /var/lib/ocis/nats
type: string
description: The directory where the filesystem storage will store NATS JetStream
data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/nats.
data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/nats.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -7231,7 +7231,7 @@ NATS_TLS_CERT:
defaultValue: /var/lib/ocis/nats/tls.crt
type: string
description: Path/File name of the TLS server certificate (in PEM format) for the
NATS listener. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/nats.
NATS listener. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/nats.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -7241,7 +7241,7 @@ NATS_TLS_KEY:
defaultValue: /var/lib/ocis/nats/tls.key
type: string
description: Path/File name for the TLS certificate key (in PEM format) for the
NATS listener. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/nats.
NATS listener. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/nats.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -7921,7 +7921,7 @@ OCIS_ASSET_THEMES_PATH:
defaultValue: /var/lib/ocis/web/assets/themes
type: string
description: Serve ownCloud themes from a path on the filesystem instead of the
builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/web/assets/themes
builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/web/assets/themes
introductionVersion: 6.0.0
deprecationVersion: ""
removalVersion: ""
@@ -9358,7 +9358,7 @@ OCM_OCM_CORE_JSON_FILE:
defaultValue: /var/lib/ocis/storage/ocm/ocmshares.json
type: string
description: 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.
the root directory derives from $OCIS_BASE_DATA_PATH:/storage.
introductionVersion: "5.0"
deprecationVersion: ""
removalVersion: ""
@@ -9388,7 +9388,7 @@ OCM_OCM_INVITE_MANAGER_JSON_FILE:
type: string
description: Path to the JSON file where OCM invite data will be stored. This file
is maintained by the instance and must not be changed manually. If not defined,
the root directory derives from $OCIS_BASE_DATA_PATH/storage/ocm.
the root directory derives from $OCIS_BASE_DATA_PATH:/storage/ocm.
introductionVersion: "5.0"
deprecationVersion: ""
removalVersion: ""
@@ -9416,7 +9416,7 @@ OCM_OCM_PROVIDER_AUTHORIZER_PROVIDERS_FILE:
defaultValue: /etc/ocis/ocmproviders.json
type: string
description: Path to the JSON file where ocm invite data will be stored. Defaults
to $OCIS_CONFIG_DIR/ocmproviders.json.
to $OCIS_CONFIG_DIR:/ocmproviders.json.
introductionVersion: "5.0"
deprecationVersion: ""
removalVersion: ""
@@ -9456,7 +9456,7 @@ OCM_OCM_SHAREPROVIDER_JSON_FILE:
defaultValue: /var/lib/ocis/storage/ocm/ocmshares.json
type: string
description: 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.
the root directory derives from $OCIS_BASE_DATA_PATH:/storage.
introductionVersion: "5.0"
deprecationVersion: ""
removalVersion: ""
@@ -10986,7 +10986,7 @@ PROXY_TRANSPORT_TLS_CERT:
defaultValue: /var/lib/ocis/proxy/server.crt
type: string
description: Path/File name of the TLS server certificate (in PEM format) for the
external http services. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/proxy.
external http services. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/proxy.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -10997,7 +10997,7 @@ PROXY_TRANSPORT_TLS_KEY:
type: string
description: Path/File name for the TLS certificate key (in PEM format) for the
server certificate to use for the external http services. If not defined, the
root directory derives from $OCIS_BASE_DATA_PATH/proxy.
root directory derives from $OCIS_BASE_DATA_PATH:/proxy.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -11077,7 +11077,7 @@ SEARCH_ENGINE_BLEVE_DATA_PATH:
defaultValue: /var/lib/ocis/search
type: string
description: The directory where the filesystem will store search data. If not defined,
the root directory derives from $OCIS_BASE_DATA_PATH/search.
the root directory derives from $OCIS_BASE_DATA_PATH:/search.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -11485,7 +11485,7 @@ SETTINGS_DATA_PATH:
defaultValue: /var/lib/ocis/settings
type: string
description: The directory where the filesystem storage will store ocis settings.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/settings.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/settings.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -12019,7 +12019,7 @@ SHARING_PUBLIC_JSON_FILE:
type: string
description: Path to the JSON file where public share meta-data will be stored.
This JSON file contains the information about public shares that have been created.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -12186,7 +12186,7 @@ SHARING_USER_JSON_FILE:
defaultValue: /var/lib/ocis/storage/shares.json
type: string
description: Path to the JSON file where shares will be persisted. If not defined,
the root directory derives from $OCIS_BASE_DATA_PATH/storage.
the root directory derives from $OCIS_BASE_DATA_PATH:/storage.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -13157,7 +13157,7 @@ STORAGE_SYSTEM_OCIS_ROOT:
defaultValue: /var/lib/ocis/storage/metadata
type: string
description: Path for the directory where the STORAGE-SYSTEM service stores it's
persistent data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage.
persistent data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -13839,7 +13839,7 @@ STORAGE_USERS_OCIS_ROOT:
defaultValue: /var/lib/ocis/storage/users
type: string
description: The directory where the filesystem storage will store blobs and metadata.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage/users.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/users.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -13867,7 +13867,7 @@ STORAGE_USERS_OWNCLOUDSQL_DATADIR:
defaultValue: /var/lib/ocis/storage/owncloud
type: string
description: The directory where the filesystem storage will store SQL migration
data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage/owncloud.
data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/owncloud.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -13941,7 +13941,7 @@ STORAGE_USERS_OWNCLOUDSQL_UPLOADINFO_DIR:
defaultValue: /var/lib/ocis/storage/uploadinfo
type: string
description: The directory where the filesystem will store uploads temporarily.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage/uploadinfo.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/uploadinfo.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -13998,7 +13998,7 @@ STORAGE_USERS_POSIX_ROOT:
defaultValue: ""
type: string
description: The directory where the filesystem storage will store its data. If
not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage/users.
not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/users.
introductionVersion: 6.0.0
deprecationVersion: ""
removalVersion: ""
@@ -14294,7 +14294,7 @@ STORAGE_USERS_S3NG_ROOT:
defaultValue: /var/lib/ocis/storage/users
type: string
description: The directory where the filesystem storage will store metadata for
blobs. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage/users.
blobs. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/users.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -14429,7 +14429,7 @@ STORE_DATA_PATH:
defaultValue: /var/lib/ocis/store
type: string
description: The directory where the filesystem storage will store ocis settings.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/store.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/store.
introductionVersion: pre5.0
deprecationVersion: "5.0"
removalVersion: 7.0.0
@@ -14661,7 +14661,7 @@ THUMBNAILS_FILESYSTEMSTORAGE_ROOT:
defaultValue: /var/lib/ocis/thumbnails
type: string
description: The directory where the filesystem storage will store the thumbnails.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/thumbnails.
If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/thumbnails.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -15333,7 +15333,7 @@ USERS_LDAP_CACERT:
type: string
description: Path/File name for the root CA certificate (in PEM format) used to
validate TLS server certificates of the LDAP service. If not defined, the root
directory derives from $OCIS_BASE_DATA_PATH/idm.
directory derives from $OCIS_BASE_DATA_PATH:/idm.
introductionVersion: pre5.0
deprecationVersion: ""
removalVersion: ""
@@ -15775,7 +15775,7 @@ WEB_ASSET_APPS_PATH:
defaultValue: /var/lib/ocis/web/assets/apps
type: string
description: Serve ownCloud Web apps assets from a path on the filesystem instead
of the builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/web/assets/apps
of the builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/web/assets/apps
introductionVersion: 6.0.0
deprecationVersion: ""
removalVersion: ""
@@ -15785,7 +15785,7 @@ WEB_ASSET_CORE_PATH:
defaultValue: /var/lib/ocis/web/assets/core
type: string
description: Serve ownCloud Web assets from a path on the filesystem instead of
the builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/web/assets/core
the builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/web/assets/core
introductionVersion: 6.0.0
deprecationVersion: ""
removalVersion: ""
@@ -15805,7 +15805,7 @@ WEB_ASSET_THEMES_PATH:
defaultValue: /var/lib/ocis/web/assets/themes
type: string
description: Serve ownCloud themes from a path on the filesystem instead of the
builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/web/assets/themes
builtin assets. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/web/assets/themes
introductionVersion: 6.0.0
deprecationVersion: ""
removalVersion: ""
docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc
+4 -4
View File
@@ -466,10 +466,10 @@
| Disable TLS certificate validation for the OCM connections. Do not set this in production environments.|
|
| `OCM_OCM_INVITE_MANAGER_JSON_FILE`
| Path to the JSON file where OCM invite data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage.|
| Path to the JSON file where OCM invite data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage.|
|
| `OCM_OCM_PROVIDER_AUTHORIZER_PROVIDERS_FILE`
| Path to the JSON file where ocm invite data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH/storage.|
| Path to the JSON file where ocm invite data will be stored. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage.|
|
| `OCM_OCM_PROVIDER_AUTHORIZER_VERIFY_REQUEST_HOSTNAME`
| Verify the hostname of the request against the hostname of the OCM provider.|
@@ -484,7 +484,7 @@
| Directory where the ocm storage provider persists its data like tus upload info files.|
|
| `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.|
| 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`
@@ -496,7 +496,7 @@
| 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.|
| 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_DEBUG_ADDR`