diff --git a/installation/build.gradle b/installation/build.gradle index 22f373cbdc05f336afd3694c0c69f5d7c09af65e..0744bd71035a3f94336ca5636be8ac34e3c6acd8 100644 --- a/installation/build.gradle +++ b/installation/build.gradle @@ -52,11 +52,13 @@ println "installerDir:${installerDistDir}" println "buildDir:${buildDir}" println "installer:${project.projectDir}/resource/installer" -task copyResources(type: Copy, dependsOn: [compileJava, ':openbis_standard_technologies:zip', ':openbis_standard_technologies:zipDss']) { +task copyResources(type: Copy, dependsOn: [compileJava, ':openbis_standard_technologies:zip', ':openbis_standard_technologies:zipDss', 'openbis_standard_technologies:zipBdlServer']) { from "${project.projectDir}/resource/installer" from "${project.projectDir}/../openbis_standard_technologies/dist/tarball/installer" from zipTree(project(':openbis_standard_technologies').zipDss.archivePath) into installerDistDir + from zipTree(project(':openbis_standard_technologies').zipBdlServer.archivePath) + into installerDistDir from (zipTree(project(':openbis_standard_technologies').zip.archivePath)) { into "openBIS-server" } diff --git a/installation/resource/installer/bin/backup-config.sh b/installation/resource/installer/bin/backup-config.sh index 7c9fa19065b04c51fa42b50f717925b03ee249fd..4fed6f50d32e5c68678330a92c43588210d4a32f 100755 --- a/installation/resource/installer/bin/backup-config.sh +++ b/installation/resource/installer/bin/backup-config.sh @@ -37,6 +37,7 @@ if [ -d $ROOT/openBIS-server ]; then copyFileIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/ copyFileIfExists $ROOT/openBIS-server/jetty/bin/jetty.properties $CONF/ copyFileIfExists $ROOT/openBIS-server/jetty/etc/jetty.properties $CONF/ + copyFileIfExists $ROOT/big_data_link_server/config.json $CONF/ cp $ROOT/openBIS-server/jetty/webapps/openbis/custom/welcomePageSimpleGeneric.html $CONF/ # not always present copyIfExists $ROOT/openBIS-server/jetty/etc/openBIS.keystore $CONF/.keystore diff --git a/installation/resource/installer/bin/backup-installation.sh b/installation/resource/installer/bin/backup-installation.sh index 250c3914d9666f2c5aad8e906e8c6b99aaa423c5..2eb5bfc6ae9e5280bd80f7e7a09bd2bdf3585bf5 100755 --- a/installation/resource/installer/bin/backup-installation.sh +++ b/installation/resource/installer/bin/backup-installation.sh @@ -51,6 +51,11 @@ fi echo "mv $ROOT_DIR/datastore_server $BACKUP_DIR/datastore_server" mv $ROOT_DIR/datastore_server $BACKUP_DIR/datastore_server +if [ -d $ROOT_DIR/big_data_link_server ]; then + echo "mv $ROOT_DIR/big_data_link_server $BACKUP_DIR/big_data_link_server" + mv $ROOT_DIR/big_data_link_server $BACKUP_DIR/big_data_link_server +fi + echo "cp -R $ROOT_DIR/core-plugins $BACKUP_DIR/core-plugins" cp -R $ROOT_DIR/core-plugins $BACKUP_DIR/core-plugins rm -rf $BACKUP_DIR/core-plugins/eln-lims/bin diff --git a/installation/resource/installer/bin/chmodx-all-scripts.sh b/installation/resource/installer/bin/chmodx-all-scripts.sh index 72026d62eb2dd88c23ba1546733f63d450076d49..b0f0695bf182fabdc6be0361d947c8e247aa8423 100644 --- a/installation/resource/installer/bin/chmodx-all-scripts.sh +++ b/installation/resource/installer/bin/chmodx-all-scripts.sh @@ -11,3 +11,6 @@ fi # set all scripts executable find $BASE/.. -type f -name "*.sh" -exec chmod 744 {} \; + +# scripts which don't end in .sh +find . -type f -name "big_data_link_server" -exec chmod 744 {} \; diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh index 1df8a1f10763629bbebbfcf790791d0c71e5b5b4..0f3b651a728f2b12bc87e3e905f319c3a8687654 100755 --- a/installation/resource/installer/bin/restore-config-from-backup.sh +++ b/installation/resource/installer/bin/restore-config-from-backup.sh @@ -41,6 +41,7 @@ if [ -d $ROOT/openBIS-server ]; then restore $CONF/dss-datasource-mapping $ROOT/openBIS-server/jetty/etc dss-datasource-mapping restore $CONF/capabilities $ROOT/openBIS-server/jetty/etc capabilities restore $CONF/../openBIS-server/jetty/webapps/openbis/custom/welcomePageSimpleGeneric.html $ROOT/openBIS-server/jetty/webapps/openbis/custom welcomePageSimpleGeneric.html + restore $CONF/config.json $ROOT/big_data_link_server config.json copyConfig $CONF/core-plugins "html/etc$" $ROOT/core-plugins copyFolderIfExists $CONF/start.d $ROOT/openBIS-server/jetty/start.d @@ -52,4 +53,4 @@ restore $CONF/dss-service.properties $ROOT/datastore_server/etc service.properti restore $CONF/dss-log.xml $ROOT/datastore_server/etc log.xml restore $CONF/datastore_server.conf $ROOT/datastore_server/etc datastore_server.conf restore $CONF/.keystore $ROOT/datastore_server/etc openBIS.keystore -copyIfExists $CONF/ext-lib $ROOT/datastore_server \ No newline at end of file +copyIfExists $CONF/ext-lib $ROOT/datastore_server diff --git a/installation/resource/installer/install.xml b/installation/resource/installer/install.xml index bc5a002a0c50d96e4c8ed9112ccc2450b883de8d..f3fe73edeb9a5706ffa46bc03742113770256480 100644 --- a/installation/resource/installer/install.xml +++ b/installation/resource/installer/install.xml @@ -213,6 +213,12 @@ <file src="@{installer.dist.dir}/data" targetdir="$DATA_TMPEXTRACT" condition="isFirstTimeInstallation"/> <parsable targetfile="$DATA_TMPEXTRACT/data/doc/getting-started-with-openBIS.html" condition="isFirstTimeInstallation"/> </pack> + + <pack name="Big Data Link Server" required="yes" loose="yes"> + <description>The distributed data store server managing raw data</description> + <file src="@{installer.dist.dir}/big_data_link_server" targetdir="$INSTALL_PATH/servers"/> + </pack> + <pack name="Administration Scripts" required="yes" loose="yes"> <description>Scripts to facilitate openBIS administration</description> diff --git a/installation/settings.gradle b/installation/settings.gradle index dbe81f483fba6382d734ac59d76f612179529e89..f4f7784b74b2f9f07a0cfe2bdcb319264b4e13e9 100644 --- a/installation/settings.gradle +++ b/installation/settings.gradle @@ -1,4 +1,4 @@ includeFlat 'commonbase', 'common', 'openbis_api', 'openbis-common', 'authentication', 'dbmigration', 'openbis', 'datastore_server', 'screening', 'rtd_yeastx', 'rtd_phosphonetx', 'deep_sequencing_unit', 'plasmid', - 'openbis_standard_technologies', 'microservice-server' + 'openbis_standard_technologies', 'big_data_link_server'