LMS-2518 adapted config backup and restore scripts

SVN: 23269

openbis/dist/admin/backup-config.sh

@@ -18,11 +18,12 @@ source $BASE/common-functions.sh
 ROOT=$BASE/../servers
 
 # -- AS
-cp $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties $CONF/
+cp $ROOT/openBIS-server/jetty/etc/service.properties $CONF/
 cp $ROOT/openBIS-server/jetty/etc/log.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/
 cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/jetty.properties $CONF/
+cp $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 

openbis/dist/admin/restore-config-from-backup.sh

@@ -18,11 +18,11 @@ source $BASE/common-functions.sh
 ROOT=$BASE/../servers
 
 # -- AS
-cp $CONF/service.properties $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/
+cp $CONF/service.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/log.xml $ROOT/openBIS-server/jetty/etc/ 
-cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/bin/
+cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/etc/
 cp $CONF/jetty.xml $ROOT/openBIS-server/jetty/etc/
-cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/bin/
+cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/ 
 # not always present
 copyIfExists $CONF/.keystore $ROOT/openBIS-server/jetty/etc/openBIS.keystore

openbis_all/source/bash/has-config-changed.sh

@@ -27,8 +27,8 @@ function compare_configs {
 compare_configs $CONFIG_DIR/datastore_server-service.properties ~/sprint/datastore_server/etc/service.properties
 SERVER_DIR=~/sprint/openBIS-server/jetty
 WEBAPP_DIR=$SERVER_DIR/webapps/openbis
-compare_configs $CONFIG_DIR/service.properties $WEBAPP_DIR/WEB-INF/classes/service.properties
-compare_configs $CONFIG_DIR/openbis.conf $SERVER_DIR/bin/openbis.conf
+compare_configs $CONFIG_DIR/service.properties $SERVER_DIR/etc/classes/service.properties
+compare_configs $CONFIG_DIR/openbis.conf $SERVER_DIR/etc/openbis.conf
 compare_configs $CONFIG_DIR/images/ $WEBAPP_DIR/images/
 compare_configs $CONFIG_DIR/loginHeader.html $WEBAPP_DIR/loginHeader.html
 compare_configs $CONFIG_DIR/help.html $WEBAPP_DIR/help.html

openbis_all/source/bash/service_properties_backup.sh

@@ -14,7 +14,7 @@ export DSS_SP=datastore_server-service.properties
 
 
 export CONFIG_DIR=~openbis/config
-export PRODUCTIVE=~openbis/sprint/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties
+export PRODUCTIVE=~openbis/sprint/openBIS-server/jetty/etc/service.properties
 export DSS_PRODUCTIVE=~openbis/sprint/datastore_server/etc/service.properties
 
 export MAIL_LIST="manuel.kohler@bsse.ethz.ch"

screening/dist/tarball/installer/bin/backup-config.sh

@@ -20,11 +20,12 @@ ROOT=$BASE/../servers
 cp $BASE/env $CONF/
 
 # -- AS
-cp $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties $CONF/
+cp $ROOT/openBIS-server/jetty/etc/service.properties $CONF/
 cp $ROOT/openBIS-server/jetty/etc/log.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/
 cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/jetty.properties $CONF/
+cp $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 

screening/dist/tarball/installer/bin/restore-config-from-backup.sh

@@ -27,11 +27,11 @@ if [ -e "$CONF/env" ]; then
 fi
 
 # -- AS
-cp $CONF/service.properties $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/
+cp $CONF/service.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/log.xml $ROOT/openBIS-server/jetty/etc/ 
-cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/bin/
+cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/etc/
 cp $CONF/jetty.xml $ROOT/openBIS-server/jetty/etc/
-cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/bin/
+cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/ 
 # not always present
 copyIfExists $CONF/.keystore $ROOT/openBIS-server/jetty/etc/openBIS.keystore