From 64b01883b907d786810b7fef0859467d588ccb1e Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 27 Jun 2019 10:35:16 +0200
Subject: [PATCH] [Misc] Remove dead code since we don't release Docker images
on XWiki 9.x anymore (LTS has moved to 10.x)
---
template/xwiki/docker-entrypoint.sh | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
index fe586e4..4c769e3 100755
--- a/template/xwiki/docker-entrypoint.sh
+++ b/template/xwiki/docker-entrypoint.sh
@@ -120,15 +120,6 @@ function configure() {
safesed "replacepassword" \$DB_PASSWORD /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
safesed "replacecontainer" \$DB_HOST /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
safesed "replacedatabase" \$DB_DATABASE /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
-<% if (xwikiVersion.startsWith('9.'))
-print '''
- 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.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