From c192df681f6bbd2f69e7a90d2d4a65c920396095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Fri, 12 Jun 2026 13:45:26 +0200 Subject: [PATCH 1/2] fix: correct doubled word in "Migration With LDAP Users" docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intro of the "Migration With LDAP Users" section had a doubled word ("connected to to a different backend") and a slightly awkward "either connecting ... or by migrating" construction. Reword for clarity and parallel structure. Reported in owncloud/migrate_to_ocis#30. Co-Authored-By: Claude Opus 4.8 Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com> --- modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc b/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc index 7786dc7d2..ac9360de6 100644 --- a/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc +++ b/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc @@ -187,7 +187,7 @@ As the final step, continue with xref:#migrate-files-and-shares[Migrate Files an === Migration With LDAP Users -In general, users and groups must be accessible to oCIS. This can be achieved either connecting oCIS to the same LDAP server, or by migrating users and groups from the LDAP server that OC10 is connected to to a different backend for oCIS. +In general, users and groups must be accessible to oCIS. This can be achieved either by connecting oCIS to the same LDAP server, or by migrating users and groups from the LDAP server that OC10 uses into a different backend for oCIS. The following procedures are necessary for the data migration to be possible. From fb15d312efc76915f3d82c4e804f8e714d460085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Fri, 12 Jun 2026 13:54:34 +0200 Subject: [PATCH 2/2] fix: correct typos and grammar in migrating_to_ocis docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix several language issues found while reviewing the migration guide: - "oCis" -> "oCIS" (consistent product capitalization) - "how to setup" -> "how to set up" (verb form) - "Files of enabled users from in each user's home" -> "Files in each enabled user's home" (broken "from in", redundant phrasing) - "the users personal Space" -> "the user's personal Space" (possessive) - "IDM - where" -> "IDM — where" (em dash, consistent with rest of doc) - "migrating users and groups are divided" -> "the migration of users and groups is divided" (subject/verb clarity) - add comma before non-restrictive "which" in the ownCloud schema note Co-Authored-By: Claude Opus 4.8 Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com> --- .../pages/maintenance/migrating_to_ocis.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc b/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc index ac9360de6..c81ea9faf 100644 --- a/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc +++ b/modules/admin_manual/pages/maintenance/migrating_to_ocis.adoc @@ -29,8 +29,8 @@ The following items are migrated: * Users and groups with their membership + Either automatically or manually depending on the LDAP server used -* Files of enabled users from in each user's home directory (using rclone, which is bundled with the app) + -The data transferred is added to the users personal Space +* Files in each enabled user's home directory (using rclone, which is bundled with the app) + +The data transferred is added to the user's personal Space * User shares, group shares, and link shares === What Is Not Migrated @@ -91,7 +91,7 @@ sudo -u www-data \ === oCIS -See the https://doc.owncloud.com/[ownCloud Documentation] for how to setup an oCIS instance and more configuration details. +See the https://doc.owncloud.com/[ownCloud Documentation] for how to set up an oCIS instance and more configuration details. [IMPORTANT] ==== @@ -111,17 +111,17 @@ AUTH_APP_ENABLE_IMPERSONATION: true == User and Group Migration -No data migration can be initiated until users and groups are available on the oCis side. To avoid a failing data migration step, no user or group changes, such as adding, deleting or changing, must be applied after this migration step. +No data migration can be initiated until users and groups are available on the oCIS side. To avoid a failing data migration step, no user or group changes, such as adding, deleting or changing, must be applied after this migration step. Different steps are required for the migration of users and groups, depending on their location in OC10, to make them accessible to oCIS. Consider that the xref:ocis:admin:deployment/services/s-list/idm.adoc[internal IDM] provided by oCIS, which is a mini LDAP, has a very limited scope and is mainly targeted at small Infinite Scale installations or testing. It should therefore not be used in production environments. For larger setups or production environments, it is highly recommended to use a “real” LDAP server or to switch to an external Identity Management Solution instead. -To address these different requirements, migrating users and groups are divided into separate sections. A combination of local and LDAP-based users is not supported. +To address these different requirements, the migration of users and groups is divided into separate sections. A combination of local and LDAP-based users is not supported. === Migrate With Local Users -These steps describe the migration of local OC10 users and groups to an external LDAP or to the embedded oCIS IDM - where no external LDAP is used. +These steps describe the migration of local OC10 users and groups to an external LDAP or to the embedded oCIS IDM — where no external LDAP is used. ==== Migrate Local Users to LDAP @@ -214,7 +214,7 @@ oCIS Requirements:: In addition to the `auth-app` requirements, verify the following oCIS environment variables: * `OCIS_LDAP_USER_ENABLED_ATTRIBUTE` + -The environment variable must exist and not be false. The default value uses the ownCloud schema which is unlikely to be present in your LDAP. +The environment variable must exist and not be false. The default value uses the ownCloud schema, which is unlikely to be present in your LDAP. * `OCIS_LDAP_USER_SCHEMA_ID` and `OCIS_LDAP_GROUP_SCHEMA_ID` + These environment variables should be set appropriately (for example `entryUUID`). * `OCIS_ADMIN_USER_ID` +