From bad5bbe6fb0ea769ed2ca225375a40c6dc67b4b7 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne <thomas.mortagne@gmail.com> Date: Wed, 29 Nov 2017 20:16:47 +0100 Subject: [PATCH] XDOCKER-41: Docker image should enable filesystem storage for deleted document XDOCKER-40: Docker image use the wrong FS attachments setup --- template/xwiki/docker-entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh index 8bac635..d912a50 100755 --- a/template/xwiki/docker-entrypoint.sh +++ b/template/xwiki/docker-entrypoint.sh @@ -92,7 +92,9 @@ function configure() { echo ' Using filesystem-based attachments...' xwiki_set_cfg 'xwiki.store.attachment.hint' 'file' xwiki_set_cfg 'xwiki.store.attachment.versioning.hint' 'file' - xwiki_set_cfg 'xwiki.store.attachment.recyclebin.hint' 'file' + xwiki_set_cfg 'xwiki.store.attachment.recyclebin.content.hint' 'file' + echo ' Using filesystem-based deleted documents...' + xwiki_set_cfg 'xwiki.store.recyclebin.content.hint' 'file' echo ' Generating authentication validation and encryption keys...' xwiki_set_cfg 'xwiki.authentication.validationKey' "\$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" xwiki_set_cfg 'xwiki.authentication.encryptionKey' "\$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" -- GitLab