From 9a0e05d95c29ab1c4fb29d658035c32155bc4e2c Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 29 Nov 2017 15:45:29 +0100
Subject: [PATCH] XDOCKER-40: Docker image use the wrong FS attachments setup
---
9/mysql-tomcat/xwiki/docker-entrypoint.sh | 2 +-
9/postgres-tomcat/xwiki/docker-entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/9/mysql-tomcat/xwiki/docker-entrypoint.sh b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
index 1eb26e3..249fa72 100755
--- a/9/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -92,7 +92,7 @@ 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 ' 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)"
diff --git a/9/postgres-tomcat/xwiki/docker-entrypoint.sh b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
index 1eb26e3..249fa72 100755
--- a/9/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -92,7 +92,7 @@ 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 ' 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