diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh index 3a1363ed5c9ecb98fffe104c408dd2ff24784146..cf95f087b35e35ed98d94e93ef3e7892e2d51177 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/