From 4352aac139f6e970a2115307da91b4c3aed75cf0 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 11 Oct 2011 07:20:38 +0000 Subject: [PATCH] LMS-2518 adapted config backup and restore scripts SVN: 23268 --- installation/resource/installer/bin/backup-config.sh | 7 ++++--- .../resource/installer/bin/restore-config-from-backup.sh | 6 +++--- screening/dist/admin/backup-config.sh | 3 ++- screening/dist/admin/restore-config-from-backup.sh | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/installation/resource/installer/bin/backup-config.sh b/installation/resource/installer/bin/backup-config.sh index 7871ac491c8..1bf7f9ba566 100755 --- a/installation/resource/installer/bin/backup-config.sh +++ b/installation/resource/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 diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh index c6b2418ee7d..9ef31fe61a4 100755 --- a/installation/resource/installer/bin/restore-config-from-backup.sh +++ b/installation/resource/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 diff --git a/screening/dist/admin/backup-config.sh b/screening/dist/admin/backup-config.sh index e0003563c4d..fba9fd403c8 100755 --- a/screening/dist/admin/backup-config.sh +++ b/screening/dist/admin/backup-config.sh @@ -22,7 +22,8 @@ cp $BASE/env $CONF/ # -- AS 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/etc/jetty.properties $CONF/ cp $ROOT/openBIS-server/jetty/webapps/openbis/welcomePageSimple.html $CONF/ diff --git a/screening/dist/admin/restore-config-from-backup.sh b/screening/dist/admin/restore-config-from-backup.sh index 0fb435302f2..b938de01175 100755 --- a/screening/dist/admin/restore-config-from-backup.sh +++ b/screening/dist/admin/restore-config-from-backup.sh @@ -29,7 +29,7 @@ fi # -- AS 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/etc/ cp $CONF/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/ -- GitLab