From 397a3fdfa9d9f9fd279ca45dee592d1b0c157b69 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 6 May 2022 18:13:35 +0200 Subject: [PATCH] Migrate to my Cryptpad image --- app/cryptpad/build/default.nix | 2 +- app/cryptpad/config/config.js | 16 ++++++++-------- app/cryptpad/deploy/cryptpad.hcl | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/cryptpad/build/default.nix b/app/cryptpad/build/default.nix index 65ffad8..7e31110 100644 --- a/app/cryptpad/build/default.nix +++ b/app/cryptpad/build/default.nix @@ -39,7 +39,7 @@ in find node_modules -type f ! -path 'node_modules/gar/*' -executable -print | tee >(xargs -n 20 rm) # Remove only office that IS BIG - rm -rf www/onlyoffice + rm -rf www/common/onlyoffice ''; installPhase = '' diff --git a/app/cryptpad/config/config.js b/app/cryptpad/config/config.js index 519d3e7..48bd6ce 100644 --- a/app/cryptpad/config/config.js +++ b/app/cryptpad/config/config.js @@ -188,7 +188,7 @@ module.exports = { * Specify a directory where files should be stored. * It will be created automatically if it does not already exist. */ - filePath: './mnt/datastore/', + filePath: './root/mnt/datastore/', /* CryptPad offers the ability to archive data for a configurable period * before deleting it, allowing a means of recovering data in the event @@ -197,36 +197,36 @@ module.exports = { * To set the location of this archive directory to a custom value, change * the path below: */ - archivePath: './mnt/data/archive', + archivePath: './root/mnt/data/archive', /* CryptPad allows logged in users to request that particular documents be * stored by the server indefinitely. This is called 'pinning'. * Pin requests are stored in a pin-store. The location of this store is * defined here. */ - pinPath: './mnt/data/pins', + pinPath: './root/mnt/data/pins', /* if you would like the list of scheduled tasks to be stored in a custom location, change the path below: */ - taskPath: './mnt/data/tasks', + taskPath: './root/mnt/data/tasks', /* if you would like users' authenticated blocks to be stored in a custom location, change the path below: */ - blockPath: './mnt/block', + blockPath: './root/mnt/block', /* CryptPad allows logged in users to upload encrypted files. Files/blobs * are stored in a 'blob-store'. Set its location here. */ - blobPath: './mnt/blob', + blobPath: './root/mnt/blob', /* CryptPad stores incomplete blobs in a 'staging' area until they are * fully uploaded. Set its location here. */ - blobStagingPath: './mnt/data/blobstage', + blobStagingPath: './root/mnt/data/blobstage', - decreePath: './mnt/data/decrees', + decreePath: './root/mnt/data/decrees', /* 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 diff --git a/app/cryptpad/deploy/cryptpad.hcl b/app/cryptpad/deploy/cryptpad.hcl index cee0f1f..b04b330 100644 --- a/app/cryptpad/deploy/cryptpad.hcl +++ b/app/cryptpad/deploy/cryptpad.hcl @@ -22,7 +22,7 @@ job "cryptpad" { task "main" { driver = "docker" config { - image = "superboum/cryptpad:vkbnygcq2bihcn6m4r9m134v5hdy29c4" + image = "superboum/cryptpad:7l2fgdl9bfvf8s87rparamm9cvhb5ind" ports = [ "unsafe", "sandbox" ] volumes = [