Merge pull request #397 from haiwen/update_fuse

update 12.0 fuse
haiwen · Nov 15, 2024 · 2806f7f · 2806f7f
2 parents b1234e2 + 352c0e5
commit 2806f7f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 47 deletions.
diff --git a/manual/extension/fuse.md b/manual/extension/fuse.md
@@ -17,6 +17,43 @@ However, administrators sometimes want to access the files directly on the serve
     * Currently the implementation is '''read-only''', which means you can't modify the files through the mounted folder.
     * One debian/centos systems, you need to be in the "fuse" group to have the permission to mount a FUSE folder.
 
+## Use seaf-fuse in Docker based deployment
+
+Assume we want to mount to `/opt/seafile-fuse` in host.
+
+##### Modify seafile-server.yml
+
+Add the following content
+
+```yml
+  seafile:
+    ...
+    volumes:
+      ...
+      - /opt/seafile-fuse: /seafile-fuse
+    privileged: true
+    cap_add:
+      - SYS_ADMIN
+```
+
+##### Start seaf-fuse with the script in docker
+
+Start Seafile server and enter the container
+
+```bash
+docker compose up -d
+
+docker exec -it seafile bash
+```
+
+Start seaf-fuse in the container
+
+```bash
+cd /opt/seafile/seafile-server-latest/
+
+./seaf-fuse.sh start /seafile-fuse
+```
+
 ## Use seaf-fuse in binary based deployment
 
 Assume we want to mount to `/data/seafile-fuse`.
@@ -105,45 +142,3 @@ sudo usermod -a -G fuse <your-user-name>
 
 * Logout your shell and login again
 * Now try `./seaf-fuse.sh start <path>`again.
-
-
-## Use seaf-fuse in Docker based deployment
-
-Assume we want to mount to `/data/seafile-fuse` in host.
-
-##### Modify docker-compose.yml
-
-Add the following content
-
-```yml
-  seafile:
-    ...
-    volumes:
-      ...
-      - type: bind
-        source: /data/seafile-fuse
-        target: /seafile-fuse
-        bind:
-          propagation: rshared
-    privileged: true
-    cap_add:
-      - SYS_ADMIN
-```
-
-##### Start seaf-fuse with the script in docker
-
-Start Seafile server and enter the container
-
-```bash
-docker compose up -d
-
-docker exec -it seafile bash
-```
-
-Start seaf-fuse in the container
-
-```bash
-cd /opt/seafile/seafile-server-latest/
-
-./seaf-fuse.sh start /seafile-fuse
-```
diff --git a/manual/setup/cluster_deploy_with_docker.md b/manual/setup/cluster_deploy_with_docker.md
@@ -54,7 +54,6 @@ We assume you have already deployed memcache, MariaDB, ElasticSearch in separate
     ```
 
 6. Check and modify the configuration files (e.g., MySQL, Memcached, Elasticsearch) in configuration files
-    - [ccnet.conf](../config/ccnet-conf.md)
     - [seafevents.conf](../config/seafevents-conf.md)
     - [seafile.conf](../config/seafile-conf.md)
     - [seahub_settings.py](../config/seahub_settings_py.md)

diff --git a/manual/setup/migrate_non_docker_to_docker.md b/manual/setup/migrate_non_docker_to_docker.md
@@ -135,7 +135,7 @@ In `/etc/mysql/mariadb.conf.d/50-server.cnf` edit the following line to:
 ```
 bind-address    = 192.168.123.45
 ```
-then edit /opt/seafile-data/seafile/conf/ -> ccnet.conf seafile.conf seahub_settings.py in the Host-Line to that IP and execute the following commands:
+then edit /opt/seafile-data/seafile/conf/ -> seafile.conf seahub_settings.py in the Host-Line to that IP and execute the following commands:
 
 ```
 service networking reload

diff --git a/manual/setup_binary/installation_ce.md b/manual/setup_binary/installation_ce.md
@@ -244,7 +244,6 @@ $ tree /opt/seafile -L 2
 seafile
 ├── ccnet
 ├── conf
-│   └── ccnet.conf
 │   └── gunicorn.conf.py
 │   └── seafdav.conf
 │   └── seafile.conf

diff --git a/manual/setup_binary/migrate_from_sqlite_to_mysql.md b/manual/setup_binary/migrate_from_sqlite_to_mysql.md
@@ -49,7 +49,9 @@ mysql> use seahub_db;
 mysql> source seahub-db.sql;
 ```
 
-Modify configure files：Append following lines to [ccnet.conf](../config/ccnet-conf.md):
+!!! danger "`ccnet.conf` has been removed since Seafile 12.0"
+
+Modify configure files：Append following lines to ccnet.conf:
 
 ```
 [Database]

diff --git a/manual/upgrade/upgrade_a_cluster.md b/manual/upgrade/upgrade_a_cluster.md
@@ -175,7 +175,6 @@ After the upgrade, you should see the configuration files has been moved to the
 
 ```
 conf/
-  |__ ccnet.conf
   |__ seafile.conf
   |__ seafevent.conf
   |__ seafdav.conf