diff --git a/manual/images/seafile-cluster-arch.png b/manual/images/seafile-cluster-arch.png index 6775a191..fb15e54e 100644 Binary files a/manual/images/seafile-cluster-arch.png and b/manual/images/seafile-cluster-arch.png differ diff --git a/manual/repo/k8s/cluster/seafile-backend-deployment.yaml b/manual/repo/k8s/cluster/seafile-backend-deployment.yaml index fb4753d9..ff5d6a33 100644 --- a/manual/repo/k8s/cluster/seafile-backend-deployment.yaml +++ b/manual/repo/k8s/cluster/seafile-backend-deployment.yaml @@ -52,16 +52,6 @@ spec: configMapKeyRef: name: seafile-env key: SITE_ROOT - - name: ENABLE_SEADOC - valueFrom: - configMapKeyRef: - name: seafile-env - key: ENABLE_SEADOC - - name: SEADOC_SERVER_URL - valueFrom: - configMapKeyRef: - name: seafile-env - key: SEADOC_SERVER_URL - name: DB_HOST valueFrom: configMapKeyRef: diff --git a/manual/setup/cluster_deploy_with_docker.md b/manual/setup/cluster_deploy_with_docker.md index df187b15..0751d183 100644 --- a/manual/setup/cluster_deploy_with_docker.md +++ b/manual/setup/cluster_deploy_with_docker.md @@ -4,7 +4,7 @@ The Seafile cluster solution employs a 3-tier architecture: -* Load balancer tier: Distribute incoming traffic to Seafile servers. HA can be achieved by deploying multiple load balancer instances. +* Load balancer tier: Distribute incoming traffic to Seafile servers. HA (high availability) can be achieved by deploying multiple load balancer instances. * Seafile server cluster: a cluster of Seafile server instances. If one instance fails, the load balancer will stop handing traffic to it. So HA is achieved. * Backend storage: Distributed storage cluster, e.g. S3, Openstack Swift or Ceph. @@ -48,9 +48,6 @@ Please refer [here](./system_requirements.md#seafile-cluster) for the details ab 2. Pulling Seafile image - !!! tip - Since v12.0, Seafile PE versions are hosted on DockerHub and does not require username and password to download. - ```bash docker pull seafileltd/seafile-pro-mc:12.0-latest ``` @@ -81,7 +78,7 @@ Please refer [here](./system_requirements.md#seafile-cluster) for the details ab !!! success "Cluster init mode" - Because CLUSTER_INIT_MODE is true in the `.env` file, Seafile docker will be started in init mode and generate configuration files. As the results, you can see the following lines if you trace the Seafile container (i.e., `docker logs seafile`): + Because `CLUSTER_INIT_MODE` is true in the `.env` file, Seafile docker will be started in init mode and generate configuration files. As the results, you can see the following lines if you trace the Seafile container (i.e., `docker logs seafile`): ```log --------------------------------- @@ -126,7 +123,7 @@ Please refer [here](./system_requirements.md#seafile-cluster) for the details ab - [seahub_settings.py](../config/seahub_settings_py.md) 8. After initailizing the cluster, the following fields can be removed in `.env` - - `CLUSTER_INIT_MODE`, must be removed from .env file + - `CLUSTER_INIT_MODE`, must be removed from `.env` file - `CLUSTER_INIT_MEMCACHED_HOST` - `CLUSTER_INIT_ES_HOST` - `CLUSTER_INIT_ES_PORT` diff --git a/manual/setup/system_requirements.md b/manual/setup/system_requirements.md index 204a5e9c..af34f2fc 100644 --- a/manual/setup/system_requirements.md +++ b/manual/setup/system_requirements.md @@ -91,6 +91,6 @@ This page shows the minimal requirements of Seafile. - **Docker-base deployment integration services**: *Seafile* only !!! note "More suggestions in Seafile cluster" - - We assume you have already deployed ***Memcached*** (*redis* is not supported in cluster), ***MariaDB***, file indexer (e.g., ***ElasticSearch***) in separate machines and use ***S3*** like object storage. + - We assume you have already deployed ***Memcached*** (or *redis*), ***MariaDB***, file indexer (e.g., ***ElasticSearch***) in separate machines and use ***S3*** like object storage. - Generally, when deploying Seafile in a cluster, we recommend that you use a **storage backend** (such as AWS S3) to store Seafile data. However, according to the Seafile image startup rules and K8S persistent storage strategy, you still need to **prepare a persistent directory** for configuring the startup of the Seafile container. \ No newline at end of file diff --git a/manual/setup_binary/cluster_deployment.md b/manual/setup_binary/cluster_deployment.md index 3f3997f5..b16b242d 100644 --- a/manual/setup_binary/cluster_deployment.md +++ b/manual/setup_binary/cluster_deployment.md @@ -454,7 +454,6 @@ For **seafile.conf**: ``` [cluster] enabled = true -memcached_options = --SERVER= --POOL-MIN=10 --POOL-MAX=100 ```