From 238316c2d866c245baf65d976090b394b506bf6f Mon Sep 17 00:00:00 2001 From: mmattel Date: Thu, 8 Feb 2024 10:19:53 +0100 Subject: [PATCH] Fix envvar delta for removed envvars and file locations --- Makefile | 3 ++- docs/architecture/_index.md | 2 +- .../_includes/adoc/env-var-deltas/{.keep => .gitkeep} | 0 docs/services/_includes/adoc/env-var-deltas/_index.md | 3 --- .../general-info}/env-var-deltas/4.0.0-5.0.0-added.adoc | 0 .../general-info}/env-var-deltas/4.0.0-5.0.0-added.md | 0 .../general-info}/env-var-deltas/4.0.0-5.0.0-removed.adoc | 8 +++++++- .../general-info}/env-var-deltas/4.0.0-5.0.0-removed.md | 1 + .../env-var-deltas/make-adoc-table-from-md.txt | 0 9 files changed, 11 insertions(+), 6 deletions(-) rename docs/services/_includes/adoc/env-var-deltas/{.keep => .gitkeep} (100%) delete mode 100644 docs/services/_includes/adoc/env-var-deltas/_index.md rename docs/{ => services/general-info}/env-var-deltas/4.0.0-5.0.0-added.adoc (100%) rename docs/{ => services/general-info}/env-var-deltas/4.0.0-5.0.0-added.md (100%) rename docs/{ => services/general-info}/env-var-deltas/4.0.0-5.0.0-removed.adoc (79%) rename docs/{ => services/general-info}/env-var-deltas/4.0.0-5.0.0-removed.md (90%) rename docs/{ => services/general-info}/env-var-deltas/make-adoc-table-from-md.txt (100%) diff --git a/Makefile b/Makefile index 33c3a476c..517f08d4b 100644 --- a/Makefile +++ b/Makefile @@ -172,8 +172,9 @@ docs-generate: @for mod in $(OCIS_MODULES); do \ $(MAKE) --no-print-directory -C $$mod docs-generate || exit 1; \ done + $(MAKE) --no-print-directory -C docs docs-generate || exit 1 - cp docs/env-var-deltas/*.adoc docs/services/_includes/adoc/env-var-deltas/ + cp docs/services/general-info/env-var-deltas/*.adoc docs/services/_includes/adoc/env-var-deltas/ .PHONY: ci-go-generate ci-go-generate: diff --git a/docs/architecture/_index.md b/docs/architecture/_index.md index 968452f16..e4ed80497 100644 --- a/docs/architecture/_index.md +++ b/docs/architecture/_index.md @@ -1,7 +1,7 @@ --- title: Architecture date: 2023-12-06T13:00:00+01:00 -weight: 25 +weight: 10 geekdocRepo: https://github.com/owncloud/ocis geekdocEditPath: edit/master/docs/architecture geekdocFilePath: _index.md diff --git a/docs/services/_includes/adoc/env-var-deltas/.keep b/docs/services/_includes/adoc/env-var-deltas/.gitkeep similarity index 100% rename from docs/services/_includes/adoc/env-var-deltas/.keep rename to docs/services/_includes/adoc/env-var-deltas/.gitkeep diff --git a/docs/services/_includes/adoc/env-var-deltas/_index.md b/docs/services/_includes/adoc/env-var-deltas/_index.md deleted file mode 100644 index b58ce0c82..000000000 --- a/docs/services/_includes/adoc/env-var-deltas/_index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -GeekdocHidden: true ---- \ No newline at end of file diff --git a/docs/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 similarity index 100% rename from docs/env-var-deltas/4.0.0-5.0.0-added.adoc rename to docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.adoc diff --git a/docs/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 similarity index 100% rename from docs/env-var-deltas/4.0.0-5.0.0-added.md rename to docs/services/general-info/env-var-deltas/4.0.0-5.0.0-added.md diff --git a/docs/env-var-deltas/4.0.0-5.0.0-removed.adoc b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.adoc similarity index 79% rename from docs/env-var-deltas/4.0.0-5.0.0-removed.adoc rename to docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.adoc index 38225205a..8fd35b80d 100644 --- a/docs/env-var-deltas/4.0.0-5.0.0-removed.adoc +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.adoc @@ -28,6 +28,11 @@ | `OCIS_LDAP_BIND_PASSWORD` | Password to use for authenticating the 'bind_dn'. +| xref:{s-path}/sharing.adoc[sharing] +| `SHARING_EVENTS_TLS_ROOT_CA_CERT` +| `SHARING_EVENTS_TLS_ROOT_CA_CERTIFICATE` +| The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false. + | xref:{s-path}/users.adoc[users] | `LDAP_BIND_PASSWORD` | `OCIS_LDAP_BIND_PASSWORD` @@ -36,5 +41,6 @@ | | `LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` | `OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` -| Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's. +| Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's. + |=== diff --git a/docs/env-var-deltas/4.0.0-5.0.0-removed.md b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.md similarity index 90% rename from docs/env-var-deltas/4.0.0-5.0.0-removed.md rename to docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.md index 2869d71e8..a7dcecb71 100644 --- a/docs/env-var-deltas/4.0.0-5.0.0-removed.md +++ b/docs/services/general-info/env-var-deltas/4.0.0-5.0.0-removed.md @@ -6,5 +6,6 @@ | services/graph/pkg/config/config.go | `LDAP_BIND_PASSWORD` | `OCIS_LDAP_BIND_PASSWORD` | Password to use for authenticating the 'bind_dn'. | | services/groups/pkg/config/config.go | `LDAP_BIND_PASSWORD` | `OCIS_LDAP_BIND_PASSWORD` | Password to use for authenticating the 'bind_dn'. | | services/idp/pkg/config/config.go | `LDAP_BIND_PASSWORD` | `OCIS_LDAP_BIND_PASSWORD` | Password to use for authenticating the 'bind_dn'. | +| services/sharing/pkg/config/config.go | `SHARING_EVENTS_TLS_ROOT_CA_CERT` | `SHARING_EVENTS_TLS_ROOT_CA_CERTIFICATE` | The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false. | | services/users/pkg/config/config.go | `LDAP_BIND_PASSWORD` | `OCIS_LDAP_BIND_PASSWORD` | Password to use for authenticating the 'bind_dn'. | | services/users/pkg/config/config.go | `LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` | `OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` | Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's. | diff --git a/docs/env-var-deltas/make-adoc-table-from-md.txt b/docs/services/general-info/env-var-deltas/make-adoc-table-from-md.txt similarity index 100% rename from docs/env-var-deltas/make-adoc-table-from-md.txt rename to docs/services/general-info/env-var-deltas/make-adoc-table-from-md.txt