diff --git a/manual/changelog/changelog-for-seafile-professional-server.md b/manual/changelog/changelog-for-seafile-professional-server.md index 89c14b52..4f066072 100644 --- a/manual/changelog/changelog-for-seafile-professional-server.md +++ b/manual/changelog/changelog-for-seafile-professional-server.md @@ -830,7 +830,6 @@ fs_id_list_request_timeout = 300 Since seafile-pro 7.0.0, we have upgraded Elasticsearch to 5.6. As Elasticsearch 5.6 relies on the Java 8 environment and can't run with root, you need to run Seafile with a non-root user and upgrade the Java version. -Please check our document for how to upgrade to [7.0](../upgrade/upgrade_notes_for_7.0.x.md). ### 7.0.19 (2020/09/07) diff --git a/manual/config/env.md b/manual/config/env.md index 4bf7be08..adb129ac 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -119,7 +119,7 @@ NOTIFICATION_SERVER_VOLUME=/opt/notification-data ## S3 storage backend configurations (only valid in pro edition at deploying first time) -- `INIT_S3_STORAGE_BACKEND_CONFIG`: Whether to configure S3 storage backend synchronously during initialization (i.e., the following features in this section, for more details, please refer to [AWS S3](../setup/setup_with_amazon_s3.md)), default is `false`. +- `INIT_S3_STORAGE_BACKEND_CONFIG`: Whether to configure S3 storage backend synchronously during initialization (i.e., the following features in this section, for more details, please refer to [AWS S3](../setup/setup_with_s3.md)), default is `false`. - `INIT_S3_COMMIT_BUCKET`: S3 storage backend fs objects bucket - `INIT_S3_FS_BUCKET`: S3 storage backend block objects bucket - `INIT_S3_BLOCK_BUCKET`: S3 storage backend block objects bucket diff --git a/manual/config/seafile-conf.md b/manual/config/seafile-conf.md index d7105253..87b03aa0 100644 --- a/manual/config/seafile-conf.md +++ b/manual/config/seafile-conf.md @@ -291,7 +291,7 @@ memcached_options = --SERVER= --POOL-MIN=10 --POOL-M You may configure Seafile to use various kinds of object storage backends. -- [S3 or S3-compatible object storage](../setup/setup_with_amazon_s3.md) +- [S3 or S3-compatible object storage](../setup/setup_with_s3.md) - [Ceph RADOS](../setup/setup_with_ceph.md) - [Alibaba Cloud OSS](../setup/setup_with_oss.md) - [OpenStack Swift](../setup/setup_with_swift.md) diff --git a/manual/setup/setup_pro_by_docker.md b/manual/setup/setup_pro_by_docker.md index 6b04d4c1..1a12ff2e 100644 --- a/manual/setup/setup_pro_by_docker.md +++ b/manual/setup/setup_pro_by_docker.md @@ -86,7 +86,7 @@ The following fields merit particular attention: | `TIME_ZONE` | Time zone | `UTC` | | `INIT_SEAFILE_ADMIN_EMAIL` | Synchronously set admin username during initialization | me@example.com | | `INIT_SEAFILE_ADMIN_PASSWORD` | Synchronously set admin password during initialization | asecret | -| `INIT_S3_STORAGE_BACKEND_CONFIG` | Whether to configure S3 storage backend synchronously during initialization (i.e., the following variables with prefix `INIT_S3_*`, for more details, please refer to [AWS S3](./setup_with_amazon_s3.md)) | false | +| `INIT_S3_STORAGE_BACKEND_CONFIG` | Whether to configure S3 storage backend synchronously during initialization (i.e., the following variables with prefix `INIT_S3_*`, for more details, please refer to [AWS S3](./setup_with_s3.md)) | false | | `INIT_S3_COMMIT_BUCKET` | S3 storage backend commit objects bucket (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | | `INIT_S3_FS_BUCKET` | S3 storage backend fs objects bucket (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | | `INIT_S3_BLOCK_BUCKET` | S3 storage backend block objects bucket (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | diff --git a/manual/setup/setup_with_ceph.md b/manual/setup/setup_with_ceph.md index 4fa4eeab..e0e192a5 100644 --- a/manual/setup/setup_with_ceph.md +++ b/manual/setup/setup_with_ceph.md @@ -1,6 +1,6 @@ # Setup With Ceph -Ceph is a scalable distributed storage system. It's recommended to use Ceph's S3 Gateway (RGW) to integarte with Seafile. Seafile can also use Ceph's RADOS object storage layer for storage backend. But using RADOS requires to link with librados library, which may introduce library incompatibility issues during deployment. Furthermore the S3 Gateway provides easier to manage HTTP based interface. If you want to integrate with S3 gateway, please refer to "Use S3-compatible Object Storage" section in [this documentation](setup_with_amazon_s3.md). The documentation below is for integrating with RADOS. +Ceph is a scalable distributed storage system. It's recommended to use Ceph's S3 Gateway (RGW) to integarte with Seafile. Seafile can also use Ceph's RADOS object storage layer for storage backend. But using RADOS requires to link with librados library, which may introduce library incompatibility issues during deployment. Furthermore the S3 Gateway provides easier to manage HTTP based interface. If you want to integrate with S3 gateway, please refer to "Use S3-compatible Object Storage" section in [this documentation](setup_with_s3.md). The documentation below is for integrating with RADOS. ## Copy ceph conf file and client keyring diff --git a/manual/setup/setup_with_multiple_storage_backends.md b/manual/setup/setup_with_multiple_storage_backends.md index d652f3bd..08942d9e 100644 --- a/manual/setup/setup_with_multiple_storage_backends.md +++ b/manual/setup/setup_with_multiple_storage_backends.md @@ -174,7 +174,7 @@ The JSON file is an array of objects. Each object defines a storage class. The f ] ``` -As you may have seen, the `commits`, `fs` and `blocks` information syntax is similar to what is used in `[commit_object_backend]`, `[fs_object_backend]` and `[block_backend]` section of seafile.conf. Refer to the detailed syntax in the documentation for the storage you use. For exampe, if you use S3 storage, refer to [S3 Storage](setup_with_amazon_s3.md). +As you may have seen, the `commits`, `fs` and `blocks` information syntax is similar to what is used in `[commit_object_backend]`, `[fs_object_backend]` and `[block_backend]` section of seafile.conf. Refer to the detailed syntax in the documentation for the storage you use. For exampe, if you use S3 storage, refer to [S3 Storage](setup_with_s3.md). If you use file system as storage for `fs`, `commits` or `blocks`, you must explicitly provide the path for the `seafile-data` directory. The objects will be stored in `storage/commits`, `storage/fs`, `storage/blocks` under this path. diff --git a/manual/setup/setup_with_amazon_s3.md b/manual/setup/setup_with_s3.md similarity index 98% rename from manual/setup/setup_with_amazon_s3.md rename to manual/setup/setup_with_s3.md index b6ee2dad..35187bcb 100644 --- a/manual/setup/setup_with_amazon_s3.md +++ b/manual/setup/setup_with_s3.md @@ -266,7 +266,7 @@ openssl rand -base64 24 bucket = my-commit-objects key_id = your-key-id key = your-secret-key - host = 192.168.1.123:8080 + host = : path_style_request = true use_v4_signature = true use_https = true @@ -276,7 +276,7 @@ openssl rand -base64 24 bucket = my-fs-objects key_id = your-key-id key = your-secret-key - host = 192.168.1.123:8080 + host = : path_style_request = true use_v4_signature = true use_https = true @@ -286,7 +286,7 @@ openssl rand -base64 24 bucket = my-block-objects key_id = your-key-id key = your-secret-key - host = 192.168.1.123:8080 + host = : path_style_request = true use_v4_signature = true use_https = true diff --git a/manual/setup_binary/deploy_in_a_cluster.md b/manual/setup_binary/deploy_in_a_cluster.md index ca741670..5d3daa88 100644 --- a/manual/setup_binary/deploy_in_a_cluster.md +++ b/manual/setup_binary/deploy_in_a_cluster.md @@ -190,7 +190,7 @@ CREATE TABLE `avatar_uploaded` (`filename` TEXT NOT NULL, `filename_md5` CHAR(32 You also need to add the settings for backend cloud storage systems to the config files. * For NFS: [Setup Seafile cluster with NFS](setup_seafile_cluster_with_nfs.md) -* For S3: [Setup With Amazon S3](../setup/setup_with_amazon_s3.md) +* For S3: [Setup With Amazon S3](../setup/setup_with_s3.md) * For OpenStack Swift: [Setup With OpenStackSwift](../setup/setup_with_swift.md) diff --git a/manual/setup_binary/outline_pro.md b/manual/setup_binary/outline_pro.md index 38d066bc..a39df29e 100644 --- a/manual/setup_binary/outline_pro.md +++ b/manual/setup_binary/outline_pro.md @@ -11,7 +11,7 @@ There are two ways to deploy Seafile Pro Edition. Since version 8.0, the recomme ## S3 Storage Backends -- [Setup Seafile Professional Server With S3](../setup/setup_with_amazon_s3.md) +- [Setup Seafile Professional Server With S3](../setup/setup_with_s3.md) - [Setup Seafile Professional Server With OpenStack Swift](../setup/setup_with_swift.md) - [Data migration between different backends](../setup/migrate_backends_data.md) - [Using multiple storage backends](../setup/setup_with_multiple_storage_backends.md) diff --git a/manual/upgrade/upgrade.md b/manual/upgrade/upgrade.md index fa250450..d32e20ce 100644 --- a/manual/upgrade/upgrade.md +++ b/manual/upgrade/upgrade.md @@ -11,13 +11,12 @@ There are three types of upgrade, i.e., major version upgrade, minor version upg Please check the **upgrade notes** for any special configuration or changes before/while upgrading. -* [Upgrade notes for 7.0.x](./upgrade_notes_for_7.0.x.md) * [Upgrade notes for 7.1.x](./upgrade_notes_for_7.1.x.md) * [Upgrade notes for 8.0.x](./upgrade_notes_for_8.0.x.md) * [Upgrade notes for 9.0.x](./upgrade_notes_for_9.0.x.md) * [Upgrade notes for 10.0.x](./upgrade_notes_for_10.0.x.md) * [Upgrade notes for 11.0.x](./upgrade_notes_for_11.0.x.md) - +* [Upgrade notes for 12.0.x](./upgrade_notes_for_12.0.x.md) ## Upgrade a binary package based deployment diff --git a/manual/upgrade/upgrade_notes_for_7.0.x.md b/manual/upgrade/upgrade_notes_for_7.0.x.md deleted file mode 100644 index 96802f66..00000000 --- a/manual/upgrade/upgrade_notes_for_7.0.x.md +++ /dev/null @@ -1,12 +0,0 @@ -# Upgrade notes for 7.0.x - -These notes give additional information about changes. -Please always follow the main [upgrade guide](./upgrade.md). - -## Upgrade notes for CE-7.0.x - -If you are currently using the Seafile Community Edition, please refer to [Upgrade notes for CE-7.0.x](./ce-7.0.md). - -## Upgrade notes for Pro-7.0.x - -If you are currently using Seafile Professional, please refer to [Upgrade notes for Pro-7.0.x](pro-7.0.md). \ No newline at end of file diff --git a/manual/upgrade/upgrade_notes_for_7.1.x.md b/manual/upgrade/upgrade_notes_for_7.1.x.md index cd9bada2..8a8e8593 100644 --- a/manual/upgrade/upgrade_notes_for_7.1.x.md +++ b/manual/upgrade/upgrade_notes_for_7.1.x.md @@ -9,7 +9,7 @@ From 7.1.0 version, Seafile will depend on the Python 3 and is not compatible Therefore you cannot upgrade directly from Seafile 6.x.x to 7.1.x. -**If your current version of Seafile is not 7.0.x, you must first download the 7.0.x installation package and **[**upgrade to 7.0.x**](./upgrade_notes_for_7.0.x.md)** before performing the subsequent operations.** +**If your current version of Seafile is not 7.0.x, you must first download the 7.0.x installation package and upgrade to 7.0.x before performing the subsequent operations.** To support both Python 3.6 and 3.7, we no longer bundle python libraries with Seafile package. You need to install most of the libraries by your own as bellow. diff --git a/mkdocs.yml b/mkdocs.yml index 2feca745..88e92083 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -89,7 +89,7 @@ nav: - Setup pro edition: setup/setup_pro_by_docker.md - Advanced topics: - Storage Backends: - - S3 Backend: setup/setup_with_amazon_s3.md + - S3 Backend: setup/setup_with_s3.md - Ceph Backend: setup/setup_with_ceph.md - OpenStack Swift Backend: setup/setup_with_swift.md - Multiple Storage Backends: setup/setup_with_multiple_storage_backends.md