From 4a2c80859094cfaa6f13729faa767f1aba484ef8 Mon Sep 17 00:00:00 2001 From: Nikolaus Krismer <niko@krismer.de> Date: Sat, 24 May 2014 12:11:19 +0200 Subject: [PATCH] minor changes for local test mode --- etc/vagrant/bootstrap.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 55df88eb..9e1a3094 100644 --- a/etc/vagrant/bootstrap.sh +++ b/etc/vagrant/bootstrap.sh @@ -40,7 +40,7 @@ INSTALL_PROJECT_ISOCHRONE_LOCAL=true # will install latest isochrone release from nexus repository INSTALL_PROJECT_ISOCHRONE_RELEASE=true # will install latest isochrone snapshot from nexus repository -INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false +INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=true INSTALL_PROJECT_PSIPROBE=true PG_DB_NAME="isochrone" @@ -60,13 +60,6 @@ if [ -n "$3" ]; then fi fi -if $IS_LOCAL_TEST_DEPLOY; then - INSTALL_PROJECT_CANIGET2=false - INSTALL_PROJECT_ISOCHRONE_LOCAL=false - INSTALL_PROJECT_ISOCHRONE_RELEASE=false - INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false -fi - ########################### # General configuration ########################### @@ -157,6 +150,12 @@ INSTALL_JAVA=false INSTALL_MAVEN=false INSTALL_TOMCAT=false +if $IS_LOCAL_TEST_DEPLOY; then + INSTALL_PROJECT_CANIGET2=false + INSTALL_PROJECT_ISOCHRONE_LOCAL=false + INSTALL_PROJECT_ISOCHRONE_RELEASE=false + INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false +fi if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_PROJECT_ISOCHRONE_LOCAL || $INSTALL_PROJECT_ISOCHRONE_RELEASE || $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT || $INSTALL_PROJECT_PSIPROBE; then INSTALL_TOMCAT=true fi -- GitLab