admin scripts for screening

SVN: 17510

screening/dist/admin/backup-config.sh

@@ -18,3 +18,4 @@ cp $ROOT/openBIS-server/jetty/bin/passwd.sh $CONF/passwd.sh
 cp $ROOT/datastore_server/etc/datastore_server.conf $CONF/datastore_server.conf
 cp $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/openbis.conf
 cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/jetty.xml
+cp $ROOT/openBIS-server/jetty/etc/openBIS.keystore $CONF/.keystore 

screening/dist/admin/install.sh

@@ -20,11 +20,9 @@ psql -U $USER -d $OPENBIS_DB -f $CONFIG/empty-screening-database.sql
 
 echo Installing openBIS Datastore Server
 unzip $ROOT_DIR/datastore*.zip
-cp $CONFIG/.keystore $ROOT_DIR/datastore_server/etc/openBIS.keystore
 
 echo Installing openBIS Application Server
 unzip $ROOT_DIR/openBIS-*.zip -d $ROOT_DIR
-cp $CONFIG/.keystore $ROOT_DIR/openBIS-server/openBIS.keystore
 ./$ROOT_DIR/openBIS-server/install.sh $ROOT_DIR/openBIS-server
 
 $BASE/restore-config-from-backup.sh $CONFIG

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

@@ -19,3 +19,5 @@ cp $CONF/passwd.sh $ROOT/openBIS-server/jetty/bin/passwd.sh
 cp $CONF/datastore_server.conf $ROOT/datastore_server/etc/datastore_server.conf
 cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/bin/openbis.conf
 cp $CONF/jetty.xml $ROOT/openBIS-server/jetty/etc/jetty.xml
+cp $CONF/.keystore $ROOT/datastore_server/etc/openBIS.keystore
+cp $CONF/.keystore $ROOT/openBIS-server/jetty/etc/openBIS.keystore

screening/dist/admin/upgrade.sh

@@ -13,11 +13,12 @@ ROOT_DIR=$BASE/..
 BACKUP_DIR=$ROOT_DIR/old
 
 unalias cp
-$BASE/down.sh
+$BASE/alldown.sh
 
 NOW=`date +%y%m%d-%H%m`
 
 CONFIG=$BACKUP_DIR/config-backup-$NOW
+mkdir -p $CONFIG
 $BASE/backup-config.sh $CONFIG
 
 OLD_BIS=$BACKUP_DIR/openBIS-server-$NOW
@@ -30,17 +31,13 @@ pg_dump -U openbis -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
 
 echo Installing openBIS Datastore Server
 unzip $ROOT_DIR/datastore*.zip
-cp $CONFIG/.keystore $ROOT_DIR/datastore_server/etc/openBIS.keystore
 
 echo Installing openBIS Application Server
 unzip $ROOT_DIR/openBIS-*.zip -d $ROOT_DIR
-cp $CONFIG/.keystore $ROOT_DIR/openBIS-server/openBIS.keystore
 ./$ROOT_DIR/openBIS-server/install.sh $ROOT_DIR/openBIS-server
 
 $BASE/restore-config-from-backup.sh $CONFIG
 cp -r $OLD_BIS/jetty/indices/ $ROOT_DIR/openBIS-server/jetty/
 
 mv $ROOT_DIR/*.zip $BACKUP_DIR/
-$BASE/bisup.sh
-sleep 20
-$BASE/dssup.sh
\ No newline at end of file
+$BASE/allup.sh
\ No newline at end of file