diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 3a0d0e962bf9e2059efea185485e25e44a1a1d4a..f4d5c3f1017a848a01f0c8b0960806af75b2f1c3 100644 --- a/etc/vagrant/bootstrap.sh +++ b/etc/vagrant/bootstrap.sh @@ -246,7 +246,7 @@ INSTALL_TOMCAT=false if $IS_LOCAL_TEST_DEPLOY; then # Some projects will never be installed when in local deploy mode (like latest release/snapshot from nexus) INSTALL_PROJECT_CANIGET2=false -# INSTALL_PROJECT_PSIPROBE=false # for some reason deactivating this causes performance issues +# INSTALL_PROJECT_PSIPROBE=false # for some reason uncommenting this line causes performance issues (is this due to VM dynamic hdd size) INSTALL_ISOCHRONE_LOCAL=false INSTALL_ISOCHRONE_RELEASE=false INSTALL_ISOCHRONE_SNAPSHOT=false @@ -527,8 +527,20 @@ if $INSTALL_JAVA; then echo " - java $JAVA_VERSION"; fi if $INSTALL_NEO4J; then echo " - neo4j $NEO4J_VERSION"; fi if $INSTALL_NEO4J_SPATIAL; then echo " - neo4j-spatial $NEO4J_SPATIAL_VERSION"; fi if $INSTALL_POSTGRES; then echo " - postgresql $POSTGRESQL_VERSION"; fi -if $INSTALL_POSTGIS; then echo " - postgis 2"; fi -if $INSTALL_PGROUTING; then echo " - pgRouting $PGROUTING_VERSION"; fi +if $INSTALL_POSTGIS; then + if [ "$POSTGIS_VERSION" == "auto" ]; then + echo " - postgis2" + else + echo " - postgis $POSTGIS_VERSION" + fi +fi +if $INSTALL_PGROUTING; then + if [ "$PGROUTING_VERSION" == "auto" ]; then + echo " - pgRouting" + else + echo " - pgRouting $PGROUTING_VERSION" + fi +fi if $INSTALL_TOMCAT; then echo " - tomcat $TOMCAT_VERSION"; fi if $INSTALL_GEOSERVER; then echo " - geoserver $GEOSERVER_VERSION"; fi if $INSTALL_POSTGRES_ADMIN; then echo " - phpPgAdmin"; fi @@ -566,7 +578,7 @@ if $INSTALL_POSTGIS; then yum -y localinstall $DOWNLOAD_DIR/$ARMADILLO_FILE >> install_armadillo.log 2>&1 if [ "$POSTGIS_VERSION" == "auto" ]; then - echo "Installing postgis (from repository)" + echo "Installing postgis2 (from repository)" yum -y install postgis2_$POSTGRESQL_SHORT_VERSION >> install_postgis.log 2>&1 else echo "Installing postgis dependencies"