Merge branch 'default-config' into staging

CHANGELOG.md

@@ -8,6 +8,10 @@
 
 ## Update notes
 
+* modify default config and docker config
+* review websocket config changes and update accordingly
+* you may want to use the updated nginx config
+
 ## Features
 
 ## Bug fixes

Dockerfile

@@ -28,11 +28,8 @@ VOLUME /cryptpad/cfg
 VOLUME /cryptpad/datastore
 VOLUME /cryptpad/customize
 VOLUME /cryptpad/blobstage
-VOLUME /cryptpad/pins
-VOLUME /cryptpad/tasks
 VOLUME /cryptpad/block
 VOLUME /cryptpad/blob
-VOLUME /cryptpad/blobstage
 VOLUME /cryptpad/data
 
 # Copy cryptpad and tini from the build container

config/config.example.js

@@ -299,12 +299,12 @@ module.exports = {
      *  Pin requests are stored in a pin-store. The location of this store is
      *  defined here.
      */
-    pinPath: './pins',
+    pinPath: './data/pins',
 
     /*  if you would like the list of scheduled tasks to be stored in
         a custom location, change the path below:
     */
-    taskPath: './tasks',
+    taskPath: './data/tasks',
 
     /*  if you would like users' authenticated blocks to be stored in
         a custom location, change the path below:
@@ -319,7 +319,7 @@ module.exports = {
     /*  CryptPad stores incomplete blobs in a 'staging' area until they are
      *  fully uploaded. Set its location here.
      */
-    blobStagingPath: './blobstage',
+    blobStagingPath: './data/blobstage',
 
     /* CryptPad supports logging events directly to the disk in a 'logs' directory
      * Set its location here, or set it to false (or nothing) if you'd rather not log

docker-compose.yml

@@ -25,10 +25,7 @@ services:
     volumes:
       - ./data/files:/cryptpad/datastore:rw
       - ./data/customize:/cryptpad/customize:rw
-      - ./data/pins:/cryptpad/pins:rw
       - ./data/blob:/cryptpad/blob:rw
-      - ./data/blobstage:/cryptpad/blobstage:rw
-      - ./data/tasks:/cryptpad/tasks:rw
       - ./data/block:/cryptpad/block:rw
       - ./data/config:/cryptpad/cfg:rw
       - ./data/data:/cryptpad/data:rw