From e0ffd8e3423fb17f927324deacd7f7e1d50b4d40 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Tue, 12 Jan 2016 12:48:09 +0100
Subject: [PATCH] added some more options; moved remote cache dir to owncloud

---
 CHANGELOG.md                    |  1 +
 Vagrantfile                     | 35 ++++++++++++++++++++++++---------
 bootstrap/config.sh             |  9 +++++----
 bootstrap/importData.sh         | 34 +++++++++++++++++---------------
 bootstrap/prepareEnvironment.sh | 30 +++++++++++++---------------
 build.gradle                    |  2 +-
 6 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75a9cf8..030ccee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - added some more options; moved remote cache dir to owncloud (Nikolaus Krismer)
   - update gradle version (Nikolaus Krismer)
   - fixed problems with deleting of tables in between srid change (Nikolaus Krismer)
   - fixed a problem when generating db dumps for multiple srids (Nikolaus Krismer)
diff --git a/Vagrantfile b/Vagrantfile
index 9be4f71..e8a1b82 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,18 +13,35 @@ end
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 HOSTNAME=`hostname -s`
-isLocalMode=true
+
+deployAllDatasets=false
+hostnameDbisIsochrone="dbis-w65107"
+hostnameDbisTests="dbis-tests"
+isJenkinsDeploy=false
+isLocalDeploy=false
 isServerOverride=ENV['TOMCAT_INIT']||false
+vname="isochrone-local"
 
-if HOSTNAME.strip.eql? "dbis-w65107"
+if HOSTNAME.strip.eql? hostnameDbisTests
+#  puts "Starting box 'isochrone-jenkins'"
+  deployAllDatasets=true
+  isJenkinsDeploy=true
+  vname="isochrone-jenkins"
+elsif HOSTNAME.strip.eql? hostnameDbisIsochrone
 #  puts "Starting box 'isochrone' (server mode)"
-  isLocalMode=false
+  deployAllDatasets=true
+  isLocalDeploy=false
+  vname="isochrone"
 elsif isServerOverride
 #  puts "Starting box 'isochrone' (forced server mode)"
-  isLocalMode=false
+  deployAllDatasets=false
+  isLocalDeploy=false
+  vname="isochrone"
 else
 #  puts "Starting box 'isochrone-local' (local mode)"
-  isLocalMode=true
+  deployAllDatasets=false
+  isLocalDeploy=true
+  vname="isochrone-local"
 end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -34,7 +51,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # WARNING: Be VERY careful with this settings!!!
   #  -> giving the client more cores can SLOW DOWN the VM (if there is not enough workload on the guest, two less cores on the host...)
   config.vm.provider "virtualbox" do |v|
-    v.name = (isLocalMode ? "isochrone-local" : "isochrone")
+    v.name = vname
     v.gui = false
     v.cpus = 1
     v.memory = 2048
@@ -63,9 +80,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder "log/bootstrap", "/var/log/vagrant_bootstrap", create: true, owner: "vagrant", group: "vagrant"
 
   # Setup environment on startup (done using a shell script)
-  config.vm.provision "shell", path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
+  config.vm.provision "shell", path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalDeploy ? "true" : "false")]
   config.vm.provision "shell", path: "bootstrap/createDatabase.sh", args: ["niko", "secretPhdPassword#2014!"]
-  config.vm.provision "shell", path: "bootstrap/importData.sh", args: ["niko", "secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
+  config.vm.provision "shell", path: "bootstrap/importData.sh", args: ["niko", "secretPhdPassword#2014!", (deployAllDatasets ? "true" : "false")]
   # Optionally activate database logging (for queryTimeLogging this is done in the testcase itself now)
   #config.vm.provision "shell", path: "bootstrap/activateDatabaseLogging.sh"
 
@@ -74,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 7473, host: 7473, id: "neo4j-ssl", auto_correct: false
   config.vm.network :forwarded_port, guest: 7474, host: 7474, id: "neo4j", auto_correct: false
   config.vm.network :forwarded_port, guest: 80,   host: 8000, id: "httpd", auto_correct: false
-  unless isLocalMode
+  unless isLocalDeploy
   	config.vm.network :forwarded_port, guest: 8080, host: 8080, id: "tomcat", auto_correct: false
   end
 #  config.vm.network :private_network, :ip => '192.168.4.50'
diff --git a/bootstrap/config.sh b/bootstrap/config.sh
index 0ea1d2e..5a9e5e5 100755
--- a/bootstrap/config.sh
+++ b/bootstrap/config.sh
@@ -15,16 +15,17 @@ TARGET_SRID="3857"
 UPDATE_DATA=false
 
 CACHE_DIR_LOCAL="/tmp/vagrant-cache"
-CACHE_DIR_REMOTE="http://dbis-informatik.uibk.ac.at/static/ma/niko"
-CACHE_DIR_REMOTE_ISO="${CACHE_DIR_REMOTE}/isochrone"
-CACHE_DIR_REMOTE_DATA="${CACHE_DIR_REMOTE}/isochrone_dump"
+CACHE_DIR_REMOTE="https://dbis-owncloud.uibk.ac.at"
+CACHE_DIR_REMOTE_ISO="${CACHE_DIR_REMOTE}/index.php/s/C6OdFprXW71ugNW/download?path=%2F&files="
+CACHE_DIR_REMOTE_DATA="${CACHE_DIR_REMOTE}/index.php/s/kgjm3CItQJ6P374/download?path=%2F2016&files="
 DEPLOY_DIR="/opt"
 DATA_DIR="$DEPLOY_DIR/data"
 SETUP_DIR="/setup"
 WORKING_DIR="/var/log/vagrant_bootstrap"
 
 # Parameters that can also (some must) be passed as arguments
-IS_LOCAL_TEST_DEPLOY=false
+DEPLOY_ALL_DATASETS=false
+IS_LOCAL_DEPLOY=false
 PG_DB_NAME="isochrone"
 PG_DB_USER="@db_username@"
 PG_DB_PASSWORD="@db_password@"
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index 7ef3a32..84a8c56 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -33,7 +33,7 @@ fi
 
 fn_arg2string PG_DB_USER "${1}" "${PG_DB_USER}"
 fn_arg2string PG_DB_PASSWORD "${2}" "${PG_DB_PASSWORD}"
-fn_arg2boolean IS_LOCAL_TEST_DEPLOY "${3}" "${IS_LOCAL_TEST_DEPLOY}"
+fn_arg2boolean DEPLOY_ALL_DATASETS "${3}" "${DEPLOY_ALL_DATASETS}"
 
 ######################################
 # Configuration (tool versions, ...) #
@@ -46,6 +46,8 @@ OSM_BOUNDING_ITALY="${CITY_POLYGON_DIR}/italy.poly"
 OSM_BOUNDING_SALZBURG="${CITY_POLYGON_DIR}/salzburg.poly"
 OSM_BOUNDING_SANFRANCISCO="${CITY_POLYGON_DIR}/sanfrancsico.poly"
 OSM_BOUNDING_TRENTOALTOADIGE="${CITY_POLYGON_DIR}/trentinoaltoadige.poly"
+#DENSITY="60,120,180,240,300"
+DENSITY="100,200,300,400,500,600,700,800,900,1000"
 OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
 OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
 OSM_FILE_CALIFORNIA="north-america/us/california-140301.osm.pbf"
@@ -101,7 +103,7 @@ function fn_import_dataset_postgis() {
 
 	if ! $UPDATE_DATA; then
 		echo "  - downloading SQL export"
-		fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE $CACHE_DIR_REMOTE_DATA/$SQL_EXPORT_FILE
+		fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE "${CACHE_DIR_REMOTE_DATA}${SQL_EXPORT_FILE}"
 		cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
 
 		echo "  - importing SQL export into PostGIS database"
@@ -133,7 +135,7 @@ function fn_import_dataset_postgis() {
 	fi
 
 	if $AVAILABLE_POSTGIS && $AVAILABLE_ISOCHRONE_TOOLS; then
-		java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t "$CITY" -d 60,120,180,240,300 >> "$WORKING_DIR/create_datamodel_$CITY_$SRID.log" 2>&1
+		java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t "$CITY" -d "$DENSITY" >> "$WORKING_DIR/create_datamodel_$CITY_$SRID.log" 2>&1
 	fi
 
 	if $AVAILABLE_ISOCHRONE_DATAMODEL; then
@@ -159,9 +161,9 @@ function fn_init_geoserver() {
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bz.gs >> setup_geoserver_neo4j.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_ibk.gs >> setup_geoserver_neo4j.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sf.gs >> setup_geoserver_neo4j.log 2>&1
-		if ! $IS_LOCAL_TEST_DEPLOY; then
-#			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_it.gs >> setup_geoserver_neo4j.log 2>&1
-#			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_st.gs >> setup_geoserver_neo4j.log 2>&1
+		if $DEPLOY_ALL_DATASETS; then
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_it.gs >> setup_geoserver_neo4j.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_st.gs >> setup_geoserver_neo4j.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
 		fi
 	fi
@@ -175,9 +177,9 @@ function fn_init_geoserver() {
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_bz.gs >> setup_geoserver_postgis.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_ibk.gs >> setup_geoserver_postgis.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sf.gs >> setup_geoserver_postgis.log 2>&1
-		if ! $IS_LOCAL_TEST_DEPLOY; then
-#			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_it.gs >> setup_geoserver_postgis.log 2>&1
-#			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_st.gs >> setup_geoserver_postgis.log 2>&1
+		if $DEPLOY_ALL_DATASETS; then
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_it.gs >> setup_geoserver_postgis.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_st.gs >> setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1
 		fi
 	fi
@@ -189,7 +191,7 @@ function fn_import_spatialite() {
 	SPATIALITE_FILENAME="isochrone_${SRID}.spatialite"
 	if ! $UPDATE_DATA; then
 		echo "Importing spatialite database"
-		fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILENAME $CACHE_DIR_REMOTE_DATA/$SPATIALITE_FILENAME
+		fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILENAME "${CACHE_DIR_REMOTE_DATA}${SPATIALITE_FILENAME}"
 		cp -f "$DOWNLOAD_DIR/$SPATIALITE_FILENAME" "$DATA_DIR/"
 	fi
 	
@@ -231,8 +233,8 @@ if $AVAILABLE_POSTGIS && $AVAILABLE_ISOCHRONE_TOOLS; then
 	echo "Importing data for synthetic networks"
 	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.GridNetworkGenerator -d 100 -l 60 > "$WORKING_DIR/generate_gridNetwork.log" 2>&1
 	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.SpiderNetworkGenerator -d 6 -lvl 1000 -l 60 > "$WORKING_DIR/generate_spiderNetwork.log" 2>&1
-	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t grid_s100 -d 60,120,180,240,300 >> "$WORKING_DIR/generate_gridNetwork.log" 2>&1
-	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t spider_l1000 -d 60,120,180,240,300 >> "$WORKING_DIR/generate_spiderNetwork.log" 2>&1
+	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t grid_s100 -d "$DENSITY" >> "$WORKING_DIR/generate_gridNetwork.log" 2>&1
+	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t spider_l1000 -d "$DENSITY" >> "$WORKING_DIR/generate_spiderNetwork.log" 2>&1
 fi
 
 SRID_ARR=(${TARGET_SRID//,/ })
@@ -242,10 +244,10 @@ for CURRENT_SRID in "${SRID_ARR[@]}"; do
 	fn_import_dataset "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_INNSBRUCK_FILTERED" "$OSM_BOUNDING_INNSBRUCK" "$CURRENT_SRID"
 	fn_import_dataset "Salzburg" "$OSM_FILE_AUSTRIA" "$OSM_FILE_SALZBURG_FILTERED" "$OSM_BOUNDING_SALZBURG" "$CURRENT_SRID"
 	fn_import_dataset "SanFrancisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SANFRANCISCO_FILTERED" "$OSM_BOUNDING_SANFRANCISCO" "$CURRENT_SRID"
-#	if ! $IS_LOCAL_TEST_DEPLOY; then
-#		fn_import_dataset "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_ITALY_FILTERED" "$OSM_BOUNDING_ITALY"
-#		fn_import_dataset "TrentoAltoAdige" "$OSM_FILE_ITALY" "$OSM_FILE_TRENTOALTOADIGE_FILTERED" "$OSM_BOUNDING_TRENTOALTOADIGE"
-#	fi
+	if $DEPLOY_ALL_DATASETS; then
+		fn_import_dataset "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_ITALY_FILTERED" "$OSM_BOUNDING_ITALY"
+		fn_import_dataset "TrentoAltoAdige" "$OSM_FILE_ITALY" "$OSM_FILE_TRENTOALTOADIGE_FILTERED" "$OSM_BOUNDING_TRENTOALTOADIGE"
+	fi
 	
 	# Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import)
 	if $IMPORT_DATA_SPATIALITE; then
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 6cb2ef5..c7a62fd 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -64,7 +64,7 @@ fi
 source "${SCRIPT_DIR}/config.sh"
 
 fn_arg2string TOMCAT_PASSWORD "${1}" "${TOMCAT_PASSWORD}"
-fn_arg2boolean IS_LOCAL_TEST_DEPLOY "${2}" "${IS_LOCAL_TEST_DEPLOY}"
+fn_arg2boolean IS_LOCAL_DEPLOY "${2}" "${IS_LOCAL_DEPLOY}"
 
 ######################################
 # Configuration (tool versions, ...) #
@@ -72,7 +72,7 @@ fn_arg2boolean IS_LOCAL_TEST_DEPLOY "${2}" "${IS_LOCAL_TEST_DEPLOY}"
 
 #Armadillo from epel is too new for postgis (version 4 instead of 3), so use hard-coded file here
 ARMADILLO_FILE="armadillo-3.800.2-1.el6.x86_64.rpm"
-ARMADILLO_URL="$CACHE_DIR_REMOTE_ISO/$ARMADILLO_FILE"
+ARMADILLO_URL="${CACHE_DIR_REMOTE_ISO}${ARMADILLO_FILE}"
 GDAL_VERSION="2.0.0"
 GDAL_FILE="gdal-$GDAL_VERSION.tar.gz"
 GDAL_DOWNLOAD_URL="http://download.osgeo.org/gdal/$GDAL_VERSION/$GDAL_FILE"
@@ -81,7 +81,7 @@ GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
 GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
 GEOSERVER_SHELL_VERSION="0.2.1"
 GEOSERVER_SHELL_FILE="geoserver-shell-$GEOSERVER_SHELL_VERSION-app.zip"
-#GEOSERVER_SHELL_URL=$CACHE_DIR_REMOTE_ISO/$GEOSERVER_SHELL_FILE
+#GEOSERVER_SHELL_URL="${CACHE_DIR_REMOTE_ISO}${GEOSERVER_SHELL_FILE}"
 GEOSERVER_SHELL_URL="https://github.com/jericks/geoserver-shell/releases/download/0.2/$GEOSERVER_SHELL_FILE"
 JAVA_VERSION="8u60"
 JAVA_FILE_32="jdk-$JAVA_VERSION-linux-i586.rpm"
@@ -91,9 +91,9 @@ MAVEN_VERSION="3.3.3"
 MAVEN_FILE="apache-maven-$MAVEN_VERSION-bin.zip"
 MAVEN_DOWNLOAD_URL="http://www.eu.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/$MAVEN_FILE"
 NEO4J_DB_USER="neo4j"
-NEO4J_VERSION="2.2.5"
+NEO4J_VERSION="2.3.1"
 NEO4J_FILE="neo4j-community-$NEO4J_VERSION-unix.tar.gz"
-NEO4J_DOWNLOAD_URL="http://dist.neo4j.org/$NEO4J_FILE"
+NEO4J_DOWNLOAD_URL="http://neo4j.com/artifact.php?name=$NEO4J_FILE"
 NEO4J_SERVICE_NAME="neo4j"
 #NEO4J_SPATIAL_GIT_URL="https://github.com/neo4j/spatial.git"
 #NEO4J_SPATIAL_VERSION="0.13-neo4j-2.1"
@@ -122,8 +122,8 @@ POSTGIS_VERSION="auto"      # activate to install from repository
 #POSTGIS_VERSION="2.1.5"    # activate to install from source
 POSTGRESQL_DATA_DIR="/var/lib/pgsql/data"
 POSTGRESQL_SERVICE_NAME="postgresql"
-POSTGRESQL_SHORT_VERSION=""
-POSTGRESQL_VERSION=""
+POSTGRESQL_SHORT_VERSION="95"
+POSTGRESQL_VERSION="9.5"
 REPO_ELGIS="none"
 REPO_EPEL="none"
 REPO_POSTGRESQL="none"        # will be set later (depending on architecture)
@@ -169,14 +169,12 @@ DISTRI_SUPPORTED=false
 DISTRI_TYPE=""
 DISTRI=$(printf "$DISTRI_NAME" | cut -d " " -f 1)
 if [ "$DISTRI" == "CentOS" ]; then
-	POSTGRESQL_SHORT_VERSION="94"
-	POSTGRESQL_VERSION="9.4"
 	if printf "$DISTRI_NAME" | egrep -q " 6." ; then
 		DISTRI_TYPE="CentOS 6"
 		REPO_ELGIS="http://elgis.argeo.org/repos/6/elgis-release-6-6_0.noarch.rpm"
 		REPO_EPEL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
-		REPO_POSTGRESQL_32="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-6-i386/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-1.noarch.rpm"
-		REPO_POSTGRESQL_64="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-6-x86_64/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-1.noarch.rpm"
+		REPO_POSTGRESQL_32="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-6-i386/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-2.noarch.rpm"
+		REPO_POSTGRESQL_64="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-6-x86_64/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-2.noarch.rpm"
 		REPO_RPMFORGE_32="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.i686.rpm"
 		REPO_RPMFORGE_64="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm"
 		DISTRI_SUPPORTED=true
@@ -184,7 +182,7 @@ if [ "$DISTRI" == "CentOS" ]; then
 		DISTRI_TYPE="CentOS 7"
 		ARMADILLO_FILE="none"
 		REPO_EPEL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
-		REPO_POSTGRESQL_64="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-7-x86_64/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-1.noarch.rpm"
+		REPO_POSTGRESQL_64="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-7-x86_64/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-2.noarch.rpm"
 		REPO_RPMFORGE_64="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el7.rf.x86_64.rpm"
 		DISTRI_SUPPORTED=$IS_64_BIT
 	fi
@@ -214,7 +212,7 @@ if $UPDATE_DATA; then
 	INSTALL_ISOCHRONE_DATAMODEL=true
 fi
 
-if $IS_LOCAL_TEST_DEPLOY; then
+if $IS_LOCAL_DEPLOY; then
 	# Some projects will never be installed when in local deploy mode (like latest release/snapshot from nexus)
 	INSTALL_PROJECT_PSIPROBE=false
 	INSTALL_ISOCHRONE_LOCAL=false
@@ -362,7 +360,7 @@ echo " Bootstrapping the VM ($(date +%H:%M:%S)):"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Operating system $DISTRI_NAME"
 echo "  - osType: $DISTRI_TYPE"
-if $IS_LOCAL_TEST_DEPLOY; then echo "Starting in local test deploy mode"; fi
+if $IS_LOCAL_DEPLOY; then echo "Starting in local test deploy mode"; fi
 echo "Installing software:"
 if $INSTALL_HTTPD; then echo "  - apache webserver"; fi
 if $INSTALL_MAVEN; then echo "  - apache maven $MAVEN_VERSION"; fi
@@ -451,7 +449,7 @@ fi
 
 if $INSTALL_JAVA; then
 	echo "Installing java (oracle jdk-$JAVA_VERSION)"
-	fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE $CACHE_DIR_REMOTE_ISO/$JAVA_FILE
+	fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE "${CACHE_DIR_REMOTE_ISO}${JAVA_FILE}"
 	yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE >> $WORKING_DIR/install_java.log 2>&1
 	ln -sf /usr/java/latest $DEPLOY_DIR/jdk >> $WORKING_DIR/setup_java.log 2>&1
 	ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre >> $WORKING_DIR/setup_java.log 2>&1
@@ -469,7 +467,7 @@ if $INSTALL_JAVA; then
 	source /etc/profile.d/java.sh
 
 	echo "  - installing strong cryptographie"
-	fn_download_newer $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE $CACHE_DIR_REMOTE_ISO/$JAVA_CRYPTO_FILE
+	fn_download_newer $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE "${CACHE_DIR_REMOTE_ISO}${JAVA_CRYPTO_FILE}"
 	unzip -j -u -d $DEPLOY_DIR/jre/lib/security $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE >> $WORKING_DIR/setup_java.log 2>&1
 fi
 
diff --git a/build.gradle b/build.gradle
index b10c13d..aecef63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Plugin declaration
 
 buildscript {
-	apply from: 'http://dbis-informatik.uibk.ac.at/static/ma/niko/gradle/changelog.gradle'
+	apply from: 'https://dbis-owncloud.uibk.ac.at/index.php/s/VOI0J20KJtOrFA9/download?path=%2F&files=changelog.gradle'
 }
 
 plugins {
-- 
GitLab