speed increasement (found after trial-and-error; why is there a major

difference?)

etc/vagrant/bootstrap.sh

@@ -39,23 +39,30 @@ IMPORT_OSMDATA_CACHED=true
 IMPORT_SCHEDULES=true
 INSTALL_GEOSERVER=false
 INSTALL_HTTPD=true
-INSTALL_ISOCHRONE_LOCAL=false # installs isochrone from vagrant start directory (eclipse project)
-INSTALL_ISOCHRONE_RELEASE=true # installs latest isochrone release from nexus repository
-INSTALL_ISOCHRONE_SNAPSHOT=true # installs latest isochrone snapshot from nexus repository
 INSTALL_NEO4J=false
 INSTALL_NEO4J_SPATIAL=false
 INSTALL_PGROUTING=true
 INSTALL_POSTGIS=true
 INSTALL_POSTGRES=true
 INSTALL_POSTGRES_ADMIN=true
-INSTALL_PROJECT_CANIGET2=false # installs caniget2 sample project
-INSTALL_PROJECT_PSIPROBE=false
+
+# IS_LOCAL_TEST_DEPLOY will prevent install of projects (can be set using command-line argument)
+# PsiProbe will always be installed if INSTALL_PROJECT_PSIPROBE is true (even when this is set to true)
+IS_LOCAL_TEST_DEPLOY=false
+# will install caniget2 sample project
+INSTALL_PROJECT_CANIGET2=false
+# will install isochrone from vagrant start directory (eclipse project)
+INSTALL_ISOCHRONE_LOCAL=false
+# will install latest isochrone release from nexus repository
+INSTALL_ISOCHRONE_RELEASE=true
+# will install latest isochrone snapshot from nexus repository
+INSTALL_ISOCHRONE_SNAPSHOT=true
+INSTALL_PROJECT_PSIPROBE=true
 
 ############################
 # Ext. argument handling   #
 ############################
 
-IS_LOCAL_TEST_DEPLOY=false # will prevent install of projects if set to true (except for PsiProbe)
 PG_DB_NAME="isochrone"
 PG_DB_USER="@db_username@"
 PG_DB_PASSWORD="@db_password@"
@@ -77,12 +84,12 @@ fi
 # General configuration    #
 ############################
 
-CACHE_DIR_LOCAL="/tmp/vagrant-cache"
-CACHE_DIR_REMOTE="http://www.krismer.de/files/PhD"
-DEPLOY_DIR="/opt"
-DOWNLOAD_DIR="$CACHE_DIR_LOCAL/wget"
-SHARED_CONF_DIR="/setup/conf"
-SHARED_IMG_DIR="/setup/img"
+CACHE_DIR_LOCAL=/tmp/vagrant-cache
+CACHE_DIR_REMOTE=http://www.krismer.de/files/PhD
+DEPLOY_DIR=/opt
+DOWNLOAD_DIR=$CACHE_DIR_LOCAL/wget
+SHARED_CONF_DIR=/setup/conf
+SHARED_IMG_DIR=/setup/img
 WORKING_DIR=`pwd`
 
 ############################
@@ -103,7 +110,7 @@ JAVA_FILE_64="jdk-$JAVA_VERSION-linux-x64.rpm"
 JAVA_CRYPTO_FILE="jce_policy-8.zip"
 MAVEN_VERSION="3.2.2"
 MAVEN_FILE="apache-maven-$MAVEN_VERSION-bin.zip"
-MAVEN_DOWNLOAD_URL="http://tweedo.com/mirror/apache/maven/maven-3/3.1.1/binaries/$MAVEN_FILE"
+MAVEN_DOWNLOAD_URL="http://tweedo.com/mirror/apache/maven/maven-3/$MAVEN_VERSION/binaries/$MAVEN_FILE"
 NEO4J_DB_USER="neo4j"
 NEO4J_VERSION="2.1.3"
 NEO4J_FILE="neo4j-community-$NEO4J_VERSION-unix.tar.gz"
@@ -130,7 +137,7 @@ OSM_BBOX_BZ="${SHARED_CONF_DIR}/poly_bz.poly"
 OSM_BBOX_IBK="${SHARED_CONF_DIR}/poly_ibk.poly"
 OSM_BBOX_IT="${SHARED_CONF_DIR}/poly_it.poly"
 OSM_BBOX_SF="${SHARED_CONF_DIR}/poly_sf.poly"
-OSM_BBOX_ST="${SHARED_CONF_DIR}/poly_st.poly" #also referred to as poly_taa.poly
+OSM_BBOX_ST="${SHARED_CONF_DIR}/poly_taa.poly"
 OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
 OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
 OSM_FILE_ITALY="europe/italy-140301.osm.pbf"
@@ -155,8 +162,8 @@ POSTGRESQL_SERVICE_NAME="postgresql"
 POSTGRESQL_SHORT_VERSION=""
 POSTGRESQL_VERSION=""
 PGROUTING_GIT_URL="https://github.com/pgRouting/pgrouting.git"
-PGROUTING_VERSION="auto"      # activate to install from repository
-#PGROUTING_VERSION="2.0.0"    # activate to install from source
+#PGROUTING_VERSION="auto"      # activate to install from repository
+PGROUTING_VERSION="2.0.0"    # activate to install from source
 REPO_ELGIS="none"
 REPO_EPEL="none"
 REPO_POSTGRESQL=""            # will be set later (depending on architecture)
@@ -182,7 +189,6 @@ TOMCAT_DOWNLOAD_URL="http://tweedo.com/mirror/apache/tomcat/tomcat-8/v$TOMCAT_VE
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m"
 TOMCAT_NAME="tomcat"
 TOMCAT_USER="tomcat"
-TOMCAT_WEBAPP_DIR="$DEPLOY_DIR/$TOMCAT_NAME/webapps"
 TOPOLOGY_TOLERANCE=0.0005
 
 ############################
@@ -198,6 +204,7 @@ DISTRI_FILE="/etc/redhat-release"
 if [ ! -f "$DISTRI_FILE" ]; then
 	DISTRI_FILE="/etc/issue"
 fi
+
 DISTRI_NAME=$(cat "$DISTRI_FILE" | head -n 1)
 DISTRI_SUPPORTED=false
 DISTRI_TYPE="Fedora 20"
@@ -285,6 +292,8 @@ else
 	JAVA_FILE="$JAVA_FILE_32"
 fi
 
+TOMCAT_WEBAPP_DIR=$DEPLOY_DIR/$TOMCAT_NAME/webapps
+
 ############################
 # Function definitions     #
 ############################
@@ -334,7 +343,6 @@ fn_import_data()
 		return 1
 	fi
 
-
 	if $IMPORT_OSMDATA_CACHED; then
 		echo "  - downloading cached OpenStreetMap file"
 		fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED $CACHE_DIR_REMOTE/$OSM_FILE_FILTERED
@@ -399,6 +407,8 @@ fn_service_start()
 		systemctl start $SERVICE_NAME >> "service_start_$SERVICE_NAME.log" 2>&1
 		systemctl enable $SERVICE_NAME >> "service_start_$SERVICE_NAME.log" 2>&1
 	fi
+
+	sleep 2
 }
 
 fn_service_stop()
@@ -413,10 +423,13 @@ fn_service_stop()
 		systemctl stop $SERVICE_NAME >> "service_stop_$SERVICE_NAME.log" 2>&1
 		systemctl disable $SERVICE_NAME >> "service_stop_$SERVICE_NAME.log" 2>&1
 	fi
+
+	sleep 2
 }
 
 START=$(date +%s)
 
+echo ""
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo " Performing basic system preparations:"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -494,7 +507,7 @@ echo "  - disabled"
 sed -i 's/enabled = 1/enabled = 0/' $REPO_RPMFORGE_CONFIG
 
 ############################
-# Repository preparations  #
+# Starting boostrap        #
 ############################
 
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -540,7 +553,7 @@ fi
 
 if $INSTALL_POSTGRES; then
 	echo "Installing $POSTGRESQL_SERVICE_NAME"
-	yum -y install $POSTGRESQL_PKG_NAME $POSTGRESQL_PKG_NAME-contrib $POSTGRESQL_PKG_NAME-devel $POSTGRESQL_PKG_NAME-libs $POSTGRESQL_PKG_NAME-server >> install_postgresql.log 2>&1
+	yum -y install $POSTGRESQL_PKG_NAME $POSTGRESQL_PKG_NAME-contrib $POSTGRESQL_PKG_NAME-server >> install_postgresql.log 2>&1
 
 	echo "  - exporting postgresql options"
 	echo "export PostgreSQL_ROOT=/usr/pgsql-$POSTGRESQL_VERSION" >> /etc/profile.d/postgresql.sh
@@ -553,7 +566,7 @@ if $INSTALL_POSTGIS; then
 
 	if [ "$POSTGIS_VERSION" == "auto" ]; then
 		echo "Installing postgis (from repository)"
-		yum -y install postgis2_$POSTGRESQL_SHORT_VERSION postgis2_$POSTGRESQL_SHORT_VERSION-devel >> install_postgis.log 2>&1
+		yum -y install postgis2_$POSTGRESQL_SHORT_VERSION >> install_postgis.log 2>&1
 	else
 		echo "Installing postgis dependencies"
 		yum -y install gdal-devel geos-devel json-c-devel libxml2-devel proj-devel >> install_postgis_deps.log 2>&1
@@ -581,7 +594,17 @@ if $INSTALL_PGROUTING; then
 		yum -y install pgrouting_$POSTGRESQL_SHORT_VERSION >> install_pgRouting.log 2>&1
 	else
 		echo "Installing pgRouting dependencies"
-		yum -y install boost-devel >> install_pgRouting_deps.log 2>&1
+		yum -y install boost-devel $POSTGRESQL_PKG_NAME-devel $POSTGRESQL_PKG_NAME-libs postgis2_$POSTGRESQL_SHORT_VERSION-devel >> install_pgRouting_deps.log 2>&1
+
+#		echo "Installing CGAL 4.3"
+#		fn_download_newer $DOWNLOAD_DIR/CGAL-4.3.zip https://gforge.inria.fr/frs/download.php/32996/CGAL-4.3.zip
+#		cp $DOWNLOAD_DIR/CGAL-4.3.zip $DEPLOY_DIR/CGAL-4.3.zip
+#		unzip -o -d $DEPLOY_DIR $DEPLOY_DIR/CGAL-4.3.zip >> install_cgal.log 2>&1
+#		cd $DEPLOY_DIR/CGAL-4.3
+#		cmake . >> install_cgal.log 2>&1
+#		make >> install_cgal.log 2>&1
+#		make install >> install_cgal.log 2>&1
+#		cd $WORKING_DIR
 
 		echo "Installing pgRouting $PGROUTING_VERSION (from source)"
 		git clone -q "$PGROUTING_GIT_URL" $DEPLOY_DIR/pgRouting-$PGROUTING_VERSION
@@ -875,19 +898,15 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
 if $INSTALL_HTTPD; then
 	fn_service_start "httpd"
-	sleep 2
 fi
 if $INSTALL_POSTGRES; then
 	fn_service_start "$POSTGRESQL_SERVICE_NAME"
-	sleep 2
 fi
 if $INSTALL_NEO4J; then
 	fn_service_start "$NEO4J_SERVICE_NAME"
-	sleep 2
 fi
 if $INSTALL_TOMCAT; then
 	fn_service_start "$TOMCAT_NAME"
-	sleep 2
 fi
 
 if $INSTALL_POSTGRES; then