diff options
| author | Carla Schroder <carla@owncloud.com> | 2016-03-29 18:03:26 +0300 |
|---|---|---|
| committer | Carla Schroder <carla@owncloud.com> | 2016-03-29 18:03:26 +0300 |
| commit | 91064c96c79f3e22e3588b2e39292cd648e70a8a (patch) | |
| tree | 0ff6a449ededa61e66b3f6080eb684d8bc464221 | |
| parent | f6e327d4cadef4f8a36f642d0583ba09e3c07652 (diff) | |
| parent | c4fdbc48a8452ce8e22788efe9ea6ee0e73033a9 (diff) | |
Merge pull request #2318 from RealRancor/backport_2314_stable9v9.0.1RC1
Backport #2314 to stable9
| -rw-r--r-- | admin_manual/maintenance/upgrade.rst | 9 | ||||
| -rw-r--r-- | admin_manual/release_notes.rst | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 06a34b13d..4d42e685f 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -76,4 +76,11 @@ may re-enable them. https://download.owncloud.org/download/repositories/8.2/owncloud/ .. _owncloud.org/install/: - https://owncloud.org/install/ + https://owncloud.org/install/ + +Encryption migration from oC 7.0 to 8.0 and 8.0 to 8.1 +------------------------------------------------------ + +The encryption backend was changed twice between ownCloud 7.0 and 8.0 as well as +between 8.0 and 8.1. If you're upgrading from these older versions please refer to +:ref:`upgrading_encryption_label` for the needed migration steps. diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 48ae71c02..1e9d70308 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -111,7 +111,7 @@ anymore for most requests. When you upgrade from ownCloud 8.0, with encryption enabled, to 8.1, you must enable the new encryption backend and migrate your encryption keys. See -:doc:`configuration_files/encryption_configuration` +:ref:`upgrading_encryption_label`. Encryption can no longer be disabled in ownCloud 8.1. It is planned to re-add this feature to the command line client for a future release. @@ -176,10 +176,8 @@ Manually Migrate Encryption Keys after Upgrade ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If you are using the Encryption app and upgrading from older versions of -ownCloud to ownCloud 8.0, you must manually migrate your encryption keys with -the *occ* command after the upgrade is complete, like this example for CentOS: -*sudo -u apache php occ encryption:migrate* You must run *occ* as your HTTP -user. See :doc:`../configuration_server/occ_command` to learn more about *occ* +ownCloud to ownCloud 8.0, you must manually migrate your encryption keys. +See :ref:`upgrading_encryption_label`. Windows Server Not Supported ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |