diff --git a/installation/resource/installer/bin/backup-config.sh b/installation/resource/installer/bin/backup-config.sh index 1bf7f9ba566a52070263e6ee17a8f69dd2eea216..ba5db25933686f9e2078725b336955101b897104 100755 --- a/installation/resource/installer/bin/backup-config.sh +++ b/installation/resource/installer/bin/backup-config.sh @@ -20,12 +20,14 @@ ROOT=$BASE/../servers cp $BASE/env $CONF/ # -- AS -cp $ROOT/openBIS-server/jetty/etc/service.properties $CONF/ -cp $ROOT/openBIS-server/jetty/etc/log.xml $CONF/ -copyIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/ -copyIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/etc/service.properties $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/etc/log.xml $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/ cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/ -cp $ROOT/openBIS-server/jetty/etc/jetty.properties $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/bin/jetty.properties $CONF/ +copyFileIfExists $ROOT/openBIS-server/jetty/etc/jetty.properties $CONF/ cp $ROOT/openBIS-server/jetty/webapps/openbis/welcomePageSimple.html $CONF/ # not always present copyIfExists $ROOT/openBIS-server/jetty/etc/openBIS.keystore $CONF/.keystore diff --git a/installation/resource/installer/bin/common-functions.sh b/installation/resource/installer/bin/common-functions.sh index c5c1c8440a4a6d98fb55be6cfc233f1cb619ae56..040386e9d33a9cbb6b8365dced658c4f90fb5a9f 100644 --- a/installation/resource/installer/bin/common-functions.sh +++ b/installation/resource/installer/bin/common-functions.sh @@ -30,6 +30,17 @@ executeScriptHooks() done } +# +# Copies a file (first parameter) to a destination (second parameter). +# Does nothing if file does not exist. Will follow symbolic links. +# +copyFileIfExists() +{ + if [ -e "$1" ]; then + cp -p "$1" "$2" + fi +} + # # Copies a file/folder (first parameter) to a destination (second parameter). # Does nothing if file/folder does not exist.