From b4adcbf9b720712f14d0f4af79298af78d55abd9 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 19 Apr 2016 11:52:56 +0000
Subject: [PATCH] SSDM-3525: Fix installer to support restoring configuration
from 13.04.xx
SVN: 36227
---
.../resource/installer/bin/restore-config-from-backup.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh
index 3a1363ed5c9..cf95f087b35 100755
--- a/installation/resource/installer/bin/restore-config-from-backup.sh
+++ b/installation/resource/installer/bin/restore-config-from-backup.sh
@@ -35,7 +35,13 @@ if [ -d $ROOT/openBIS-server ]; then
cp $CONF/log.xml $ROOT/openBIS-server/jetty/etc/
cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/etc/
cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/etc/
- cp $CONF/welcomePageSimpleGeneric.html $ROOT/openBIS-server/jetty/webapps/openbis/custom
+
+ # for 13.04.10 and older
+ copyIfExists $CONF/../openBIS-server/jetty/webapps/openbis/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/custom/welcomePageSimpleGeneric.html
+
+ # for 13.04.11 and later
+ copyIfExists $CONF/../openBIS-server/jetty/webapps/openbis/custom/welcomePageSimpleGeneric.html $ROOT/openBIS-server/jetty/webapps/openbis/custom
+
# not always present
copyIfExists $CONF/.keystore $ROOT/openBIS-server/jetty/etc/openBIS.keystore
copyIfExists $CONF/passwd $ROOT/openBIS-server/jetty/etc/
--
GitLab