Merge pull request #466 from haiwen/13.0_after_master_merge

13.0 after master merge

manual/config/seafile-conf.md

@@ -57,7 +57,7 @@ Seafile uses a system trash, where deleted libraries will be moved to. In this w
 
 ## Cache
 
-Seafile uses memory caches in various cases to improve performance. Some session information is also saved into memory cache to be shared among the cluster nodes. Memcached or Reids can be use for memory cache.
+seaf-server component in Seafile Pro Edition uses memory caches in various cases to improve performance. (seaf-server component in community edition does not use cache) Some session information is also saved into memory cache to be shared among the cluster nodes. Memcached or Reids can be use for memory cache.
 
 !!! tip
     Redis support is added in version 11.0 and is the default cache server from Seafile 13.0. Currently only single-node Redis is supported. Redis Sentinel or Cluster is not supported yet.

manual/extension/only_office.md

@@ -43,6 +43,7 @@ Also modify `seahub_settings.py`
 ENABLE_ONLYOFFICE = True
 ONLYOFFICE_APIJS_URL = 'https://seafile.example.com:6233/web-apps/apps/api/documents/api.js'
 ONLYOFFICE_FILE_EXTENSION = ('doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'odt', 'fodt', 'odp', 'fodp', 'ods', 'fods', 'csv', 'ppsx', 'pps')
+ONLYOFFICE_EDIT_FILE_EXTENSION = ('docx', 'pptx', 'xlsx')
 ONLYOFFICE_JWT_SECRET = '<your jwt secret>'
 ```
 

manual/repo/docker/md-server.yml

@@ -45,4 +45,4 @@ services:
 
 networks:
   seafile-net:
-    name: seafile-net
+    name: seafile-net

manual/setup/use_other_reverse_proxy.md

@@ -158,6 +158,21 @@ Modify `nginx.conf` and add reverse proxy for services ***seafile*** and ***sead
         error_log       /var/log/nginx/notification.error.log;
     }
     ```
+=== "onlyoffice"
+    ```conf
+    location /onlyofficeds/ {
+        proxy_pass http://127.0.0.1:6233/;
+        proxy_http_version 1.1;
+        client_max_body_size 100M;
+        proxy_read_timeout 3600s;
+        proxy_connect_timeout 3600s;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $proxy_connection;
+        proxy_set_header X-Forwarded-Host $the_host/onlyofficeds;
+        proxy_set_header X-Forwarded-Proto $the_scheme;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+    ```
 
 ## Modify .env
 

manual/upgrade/upgrade_a_cluster_binary.md

@@ -20,7 +20,7 @@ In general, to upgrade a cluster, you need:
 
 Doing maintanence upgrading is simple, you only need to run the script `./upgrade/minor_upgrade.sh` at each node to update the symbolic link.
 
-## Upgrade from Seafile 11 cluster (all nodes)
+## Upgrade a cluster from Seafile 11 to 12
 
 !!! tip "Clean Database"
     If you have a large number of `Activity` in MySQL, clear this table first [Clean Database](../../administration/clean_database). Otherwise, the database upgrade will take a long time.
@@ -53,7 +53,7 @@ Doing maintanence upgrading is simple, you only need to run the script `./upgrad
 
 3. [Download](../setup_binary/installation_pro.md#downloading-the-install-package) and [uncompress](../setup_binary/installation_pro.md#uncompressing-the-package) the package
 
-4. Upgrade 
+4. Run the upgrade script in a single node
 
     ```sh
     seafile-pro-server-12.x.x/upgrade/upgrade_11.0_12.0.sh
@@ -78,6 +78,6 @@ Doing maintanence upgrading is simple, you only need to run the script `./upgrad
         ./seafile-background-tasks.sh start
         ```
 
-7. Refer [here](./upgrade_notes_for_12.0.x.md#5-upgrade-notification-server) to upgrade notification server
+7. (Optional) Refer [here](./upgrade_notes_for_12.0.x.md#5-upgrade-notification-server) to upgrade notification server
 
-8. Refer [here](./upgrade_notes_for_12.0.x.md#upgrade-seadoc-from-08-to-10) to upgrade SeaDoc server
+8. (Optional) Refer [here](./upgrade_notes_for_12.0.x.md#upgrade-seadoc-from-08-to-10) to upgrade SeaDoc server

manual/upgrade/upgrade_docker.md

@@ -21,7 +21,7 @@ mv docker-compose.yml docker-compose.yml.bak
 
 ### Download Seafile 12.0 Docker files
 
-Download [.env](../docker/ce/env), [seafile-server.yml](../docker/ce/seafile-server.yml) and [caddy.yml](../docker/caddy.yml), and modify .env file according to the old configuration in `docker-compose.yml.bak`
+Download `.env`, `seafile-server.yml` and `caddy.yml`, and modify `.env` file according to the old configuration in `docker-compose.yml.bak`
 
 === "Seafile community edition"
 

manual/upgrade/upgrade_notes_for_12.0.x.md

@@ -85,38 +85,33 @@ Note, you should install Python libraries system wide using root user or sudo mo
 
 The following instruction is for binary package based installation. If you use Docker based installation, please see [*Updgrade Docker*](./upgrade_docker.md)
 
-!!! note "Notification Server"
-    If you has deployed the [Notification Server](../extension/notification-server.md). The *Notification Server* should be **re-deployed** with the same version as Seafile server.
+### 1) Clean database tables before upgrade
 
-    For example:
-    
-    - Seafile server: 12.0.3
-    - notification-server: 12.0.3
+If you have a large number of `Activity` in MySQL, clear this table first [Clean Database](../../administration/clean_database). Otherwise, the database upgrade will take a long time.
 
-    You can modify `.env` in your Notification Server host to re-deploy:
+### 2) Install new system libraries and Python libraries
 
-    ```sh
-    NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest
-    ```
+Install new system libraries and Python libraries for your operation system as documented above.
 
-    Restart Notification Server:
 
-    ```sh
-    docker compose restart
-    ```
+### 3) Stop Seafile-11.0.x server
 
-!!! tip "Clean Database"
-    If you have a large number of `Activity` in MySQL, clear this table first [Clean Database](../../administration/clean_database). Otherwise, the database upgrade will take a long time.
+In the folder of Seafile 11.0.x, run the commands:
 
-### 1) Stop Seafile-11.0.x server
+```sh
+./seahub.sh stop
+./seafile.sh stop
+```
 
-### 2) Start from Seafile 12.0.x, run the script
+### 4) Run Seafile 12.0.x upgrade script
+
+In the folder of Seafile 12.0.x, run the upgrade script
 
 ```sh
 upgrade/upgrade_11.0_12.0.sh
 ```
 
-### 3) Create the `.env` file in `conf/` directory
+### 5) Create the `.env` file in `conf/` directory
 
 conf/.env
 
@@ -141,18 +136,25 @@ SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=seahub_db
     pwgen -s 40 1
     ```
 
-### 4) Start Seafile-12.0.x server
+### 6) Start Seafile-12.0.x server
 
-### 5) Upgrade notification server
+In the folder of Seafile 12.0.x, run the command:
 
-Since seafile 12.0, we use docker to deploy the notification server. Please follow the document of [notification server](../extension/notification-server.md).
+```
+./seafile.sh start # starts seaf-server
+./seahub.sh start  # starts seahub
+```
+
+### 7) (Optional) Upgrade notification server
+
+Since seafile 12.0, we use docker to deploy the notification server. Please follow the document of [notification server](../extension/notification-server.md) to re-deploy notification server.
 
 !!! note Notification server and Seafile binary package
 
-    Notification server is designed to be work with Docker based deployment. To make it work with **Seafile binary package** on the same server is, you will need to add Nginx rules for notification server properly.
+    Notification server is designed to be work with Docker based deployment. To make it work with **Seafile binary package** on the same server, you will need to add Nginx rules for notification server properly.
 
 
-## Upgrade SeaDoc from 0.8 to 1.0
+### 8) (Optional) Upgrade SeaDoc from 0.8 to 1.0
 
 If you have deployed SeaDoc v0.8 with Seafile v11.0, you can upgrade it to 1.0 use the following two steps:
 
@@ -164,11 +166,11 @@ If you have deployed SeaDoc v0.8 with Seafile v11.0, you can upgrade it to 1.0 u
     Deploying SeaDoc and **Seafile binary package** on the same server is no longer officially supported. You will need to add Nginx rules for SeaDoc server properly.
 
 
-### Delete sdoc_db
+#### 8.1) Delete sdoc_db
 
 From version 1.0, SeaDoc is using seahub_db database to store its operation logs and no longer need an extra database sdoc_db. The database tables in seahub_db are created automatically when you upgrade Seafile server from v11.0 to v12.0. You can simply delete sdoc_db.
 
-### Deploy a new SeaDoc server
+#### 8.2) Deploy a new SeaDoc server
 
 Please see the document [Setup SeaDoc](../extension/setup_seadoc.md) to install SeaDoc on a separate machine and integrate with your binary packaged based Seafile server v12.0.