From f1dd976fc218881a1367cd3fca0ef6285e282fad Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Tue, 5 Aug 2014 20:17:29 +0200
Subject: [PATCH] not downloading osm data anymore if no import will happen
afterwards replaced all ">" by ">>" renamed some logging files (fixed invalid
extensions; added name of dataset)
---
etc/vagrant/bootstrap.sh | 179 +++++++++++++++++++++------------------
1 file changed, 98 insertions(+), 81 deletions(-)
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 13e5601c..f742e636 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -194,10 +194,14 @@ INSTALL_MAVEN=false
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_ISOCHRONE_LOCAL=false
INSTALL_ISOCHRONE_RELEASE=false
INSTALL_ISOCHRONE_SNAPSHOT=false
+else
+ # Some projects will only be installed when in local deploy mode (like pgRouting that can be used for performance comparisons)
+ INSTALL_PGROUTING=false
fi
if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_ISOCHRONE_LOCAL || $INSTALL_ISOCHRONE_RELEASE || $INSTALL_ISOCHRONE_SNAPSHOT || $INSTALL_PROJECT_PSIPROBE; then
INSTALL_TOMCAT=true
@@ -220,7 +224,7 @@ fi
############################
DISTRI_FILE="/etc/redhat-release"
-if [ ! -f "$DISTRI_FILE" ]; then
+if [ ! -f "$DISTRI_FILE" ]; then
DISTRI_FILE="/etc/issue"
fi
DISTRI_NAME=$(cat "$DISTRI_FILE" | head -n 1)
@@ -289,7 +293,7 @@ fn_download_newer()
local FILE="$1"
local URL="$2"
- if [ ! -f "$FILE" ]; then
+ if [ ! -f "$FILE" ]; then
if wget --no-check-certificate -q -O /dev/null "$URL"; then
wget --no-check-certificate -q -O "$FILE" "$URL"
fi
@@ -302,14 +306,27 @@ fn_import_data()
local OSM_FILE="$2"
local OSM_FILE_FILTERED="$3"
local BOUNDING="$4"
- local SCHEDULE_FILE="$5"
+ local SQL_EXPORT_FILE="$5"
local TABLE_PREFIX="$6"
+ local VALID_SQL_EXPORT=false
+ if $INSTALL_POSTGIS && $IMPORT_SCHEDULES; then
+ if [ -n "$SQL_EXPORT_FILE" ]; then
+ VALID_SQL_EXPORT=true
+ fi
+ fi
+
echo "Importing data for region of $NAME"
+ if ! $VALID_SQL_EXPORT && ! $INSTALL_PGROUTING && ! $INSTALL_NEO4J_SPATIAL); then
+ echo " - skipping import (since no export was found and neither pgRouting nor neo4j are installed"
+ 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
- cp $DOWNLOAD_DIR/$OSM_FILE_FILTERED $DEPLOY_DIR/$OSM_FILE_FILTERED > /dev/null 2>&1
+ cp $DOWNLOAD_DIR/$OSM_FILE_FILTERED $DEPLOY_DIR/$OSM_FILE_FILTERED >> /dev/null 2>&1
fi
if [ ! -f $DEPLOY_DIR/$OSM_FILE_FILTERED ]; then
@@ -319,35 +336,33 @@ fn_import_data()
echo " - filtering OpenStreetMap data"
if [[ "$BOUNDING" == *.poly ]]; then
- $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-polygon file="$BOUNDING" --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osm_data.sh 2>&1
+ $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-polygon file="$BOUNDING" --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osmData_$NAME.log 2>&1
else
- $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-box $BOUNDING --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osm_data.sh 2>&1
+ $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-box $BOUNDING --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osmData_$NAME.log 2>&1
fi
fi
- if $INSTALL_POSTGIS && $IMPORT_SCHEDULES; then
- if [ -n "$SCHEDULE_FILE" ]; then
- echo " - downloading schedule"
- fn_download_newer $DOWNLOAD_DIR/$SCHEDULE_FILE $CACHE_DIR_REMOTE/$SCHEDULE_FILE
- cp $DOWNLOAD_DIR/$SCHEDULE_FILE $DEPLOY_DIR/$SCHEDULE_FILE > /dev/null 2>&1
-
- echo " - importing schedule into postgis database"
- gunzip -c $DEPLOY_DIR/$SCHEDULE_FILE | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost "$PG_DB_NAME" >> $WORKING_DIR/import_schedule.log 2>&1
-
- echo " - fixing schedule permissions"
- tables=`PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" "$PG_DB_NAME"`
- for tbl in $tables ; do
- PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "ALTER TABLE $tbl OWNER TO $PG_DB_USER" "$PG_DB_NAME";
- done
- fi
+ if $VALID_SQL_EXPORT; then
+ echo " - downloading sql export"
+ fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE $CACHE_DIR_REMOTE/$SQL_EXPORT_FILE
+ cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DEPLOY_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
+
+ echo " - importing sql export into postgis database"
+ gunzip -c $DEPLOY_DIR/$SQL_EXPORT_FILE | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost "$PG_DB_NAME" >> $WORKING_DIR/import_schedule_$NAME.log 2>&1
+
+ echo " - fixing table permissions"
+ tables=`PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" "$PG_DB_NAME"`
+ for tbl in $tables ; do
+ PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "ALTER TABLE $tbl OWNER TO $PG_DB_USER" "$PG_DB_NAME";
+ done
fi
if $INSTALL_PGROUTING; then
echo " - importing filtered OpenStreetMap data into pgRouting"
- $DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_DIR/$OSM_FILE_FILTERED" -conf "$OSM2PGROUTING_MAPPING_CONF" -dbname $PG_DB_NAME -user $PG_DB_USER -passwd $PG_DB_PASSWORD -clean -prefixtables $TABLE_PREFIX >> import_osm2pgrouting.log 2>&1
+ $DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_DIR/$OSM_FILE_FILTERED" -conf "$OSM2PGROUTING_MAPPING_CONF" -dbname $PG_DB_NAME -user $PG_DB_USER -passwd $PG_DB_PASSWORD -clean -prefixtables $TABLE_PREFIX >> import_osm2pgrouting_$NAME.log 2>&1
echo " - creating pgRouting topology"
- PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "SELECT pgr_createTopology('${TABLE_PREFIX}ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "SELECT pgr_createTopology('${TABLE_PREFIX}ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database_$NAME.log 2>&1
fi
if $INSTALL_NEO4J_SPATIAL; then
@@ -356,6 +371,8 @@ fn_import_data()
mvn exec:java -Dexec.mainClass=org.neo4j.gis.spatial.osm.OSMImporter -Dexec.args="$DEPLOY_DIR/neo4j/data/graph.db $DEPLOY_DIR/$OSM_FILE_FILTERED" >> $WORKING_DIR/import_osm2neo4j.log 2>&1
cd $WORKING_DIR
fi
+
+ return 0
}
fn_service_start()
@@ -400,10 +417,10 @@ cd $WORKING_DIR
mkdir -p $DOWNLOAD_DIR
echo "Configuring timezone"
-cp /usr/share/zoneinfo/Europe/Vienna /etc/localtime > setup_timezone.log 2>&1
+cp /usr/share/zoneinfo/Europe/Vienna /etc/localtime >> setup_timezone.log 2>&1
echo "Installing utils (gcc, git, ...)"
-yum -y install gcc gcc-c++ git gzip iptables-services nano nmap sed tar unzip wget > install_utils.log 2>&1
+yum -y install gcc gcc-c++ git gzip iptables-services nano nmap sed tar unzip wget >> install_utils.log 2>&1
############################
# Security preparations #
@@ -418,7 +435,7 @@ else
fi
if [ $(getenforce) == "Enforcing" ]; then
- setenforce 0 > stop_selinux.log 2>&1
+ setenforce 0 >> stop_selinux.log 2>&1
fi
sed -i 's/SELINUX=enabled/SELINUX=disabled/' $SELINUX_CONFIG
@@ -437,20 +454,20 @@ if $INSTALL_POSTGRES; then
# Epel Repository is needed for dependencies (gdal!) of postgresql/postgis/pgRouting
echo "Installing epel repository"
fn_download $DOWNLOAD_DIR/epel-repo.rpm $REPO_EPEL
- yum -y localinstall $DOWNLOAD_DIR/epel-repo.rpm > install_epel_repo.log 2>&1
- echo " - enabled"
+ yum -y localinstall $DOWNLOAD_DIR/epel-repo.rpm >> install_epel_repo.log 2>&1
+ echo " - enabled"
echo "Installing $POSTGRESQL_SERVICE_NAME repository"
fn_download $DOWNLOAD_DIR/postgresql-repo.rpm $REPO_POSTGRESQL
- yum -y localinstall $DOWNLOAD_DIR/postgresql-repo.rpm > install_postgresql_repo.log 2>&1
- echo " - enabled"
+ yum -y localinstall $DOWNLOAD_DIR/postgresql-repo.rpm >> install_postgresql_repo.log 2>&1
+ echo " - enabled"
fi
# RpmForge is deactivated by default and has to be explicitly activated when using yum
echo "Installing rpmForge repository"
fn_download_newer $DOWNLOAD_DIR/rpmforge-repo.rpm $REPO_RPMFORGE
-yum -y localinstall $DOWNLOAD_DIR/rpmforge-repo.rpm > install_rpmforge_repo.log 2>&1
-echo " - disabled"
+yum -y localinstall $DOWNLOAD_DIR/rpmforge-repo.rpm >> install_rpmforge_repo.log 2>&1
+echo " - disabled"
sed -i 's/enabled = 1/enabled = 0/' $REPO_RPMFORGE_CONFIG
############################
@@ -492,39 +509,39 @@ echo " Performing installations:"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "Installing cmake"
-yum -y --enablerepo=rpmforge-extras install cmake > install_cmake.log 2>&1
+yum -y --enablerepo=rpmforge-extras install cmake >> install_cmake.log 2>&1
if $INSTALL_HTTPD; then
echo "Installing httpd server"
- yum -y install httpd > install_httpd.log 2>&1
+ yum -y install httpd >> install_httpd.log 2>&1
fi
if $INSTALL_POSTGRES; then
echo "Installing $POSTGRESQL_SERVICE_NAME"
- yum -y install $POSTGRESQL_PKG_NAME $POSTGRESQL_PKG_NAME-server $POSTGRESQL_PKG_NAME-contrib > install_postgresql.log 2>&1
+ 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
echo " - exporting postgresql options"
- echo "export PostgreSQL_ROOT=/usr/pgsql-9.3" > /etc/profile.d/postgresql.sh
+ echo "export PostgreSQL_ROOT=/usr/pgsql-9.3" >> /etc/profile.d/postgresql.sh
source /etc/profile.d/postgresql.sh
fi
if $INSTALL_POSTGIS; then
fn_download_newer $DOWNLOAD_DIR/$ARMADILLO_FILE "$ARMADILLO_URL"
- yum -y localinstall $DOWNLOAD_DIR/$ARMADILLO_FILE > install_armadillo.log 2>&1
+ yum -y localinstall $DOWNLOAD_DIR/$ARMADILLO_FILE >> install_armadillo.log 2>&1
if [ "$POSTGIS_VERSION" == "auto" ]; then
echo "Installing postgis (from repository)"
- yum -y install postgis2_93 > install_postgis.log 2>&1
+ yum -y install postgis2_93 postgis2_93-devel >> 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
+ yum -y install gdal-devel geos-devel json-c-devel libxml2-devel proj-devel >> install_postgis_deps.log 2>&1
echo "Installing postgis $POSTGIS_VERSION (from source)"
git clone -q "$POSTGIS_GIT_URL" $DEPLOY_DIR/postgis-$POSTGIS_VERSION
ln -sf $DEPLOY_DIR/postgis-$POSTGIS_VERSION $DEPLOY_DIR/postgis
cd $DEPLOY_DIR/postgis
- git checkout -q $POSTGIS_VERSION > /dev/null 2>&1
- ./configure > $WORKING_DIR/install_postgis.log 2>&1
+ git checkout -q $POSTGIS_VERSION >> /dev/null 2>&1
+ ./configure >> $WORKING_DIR/install_postgis.log 2>&1
make >> $WORKING_DIR/install_postgis.log 2>&1
make install >> $WORKING_DIR/install_postgis.log 2>&1
cd $WORKING_DIR
@@ -533,25 +550,25 @@ fi
if $INSTALL_POSTGRES_ADMIN; then
echo "Installing phpPgAdmin"
- yum -y install phpPgAdmin > install_phpPgAdmin.log 2>&1
+ yum -y install phpPgAdmin >> install_phpPgAdmin.log 2>&1
fi
if $INSTALL_PGROUTING; then
if [ "$PGROUTING_VERSION" == "auto" ]; then
echo "Installing pgRouting (from repository)"
- yum -y install pgrouting_93 > install_pgRouting.log 2>&1
+ yum -y install pgrouting_93 >> install_pgRouting.log 2>&1
else
echo "Installing pgRouting dependencies"
- yum -y install boost-devel $POSTGRESQL_PKG_NAME-devel $POSTGRESQL_PKG_NAME-libs postgis2_93-devel > install_pgRouting_deps.log 2>&1
+ yum -y install boost-devel >> install_pgRouting_deps.log 2>&1
echo "Installing pgRouting $PGROUTING_VERSION (from source)"
git clone -q "$PGROUTING_GIT_URL" $DEPLOY_DIR/pgRouting-$PGROUTING_VERSION
ln -sf $DEPLOY_DIR/pgRouting-$PGROUTING_VERSION $DEPLOY_DIR/pgRouting
cd $DEPLOY_DIR/pgRouting
- git checkout -q pgrouting-$PGROUTING_VERSION > /dev/null 2>&1
+ git checkout -q pgrouting-$PGROUTING_VERSION >> /dev/null 2>&1
mkdir build
cd build
- cmake -DWITH_DD=OFF -DBoost_DIR:PATH=/usr/lib64/boost -DPOSTGRESQL_EXECUTABLE:FILEPATH="$PostgreSQL_ROOT"/bin/postgres -DPOSTGRESQL_PG_CONFIG:FILEPATH="$PostgreSQL_ROOT"/bin/pg_config .. > $WORKING_DIR/install_pgRouting.log 2>&1
+ cmake -DWITH_DD=OFF -DBoost_DIR:PATH=/usr/lib64/boost -DPOSTGRESQL_EXECUTABLE:FILEPATH="$PostgreSQL_ROOT"/bin/postgres -DPOSTGRESQL_PG_CONFIG:FILEPATH="$PostgreSQL_ROOT"/bin/pg_config .. >> $WORKING_DIR/install_pgRouting.log 2>&1
make >> $WORKING_DIR/install_pgRouting.log 2>&1
make install >> $WORKING_DIR/install_pgRouting.log 2>&1
cd $WORKING_DIR
@@ -561,9 +578,9 @@ fi
if $INSTALL_JAVA; then
echo "Installing java (oracle jdk-$JAVA_VERSION)"
fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE $CACHE_DIR_REMOTE/$JAVA_FILE
- yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE > install_java.log 2>&1
- ln -sf /usr/java/latest $DEPLOY_DIR/jdk > setup_java.log 2>&1
- ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre > setup_java.log 2>&1
+ yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE >> install_java.log 2>&1
+ ln -sf /usr/java/latest $DEPLOY_DIR/jdk >> setup_java.log 2>&1
+ ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre >> setup_java.log 2>&1
echo " - setting alternatives for java"
alternatives --install /usr/bin/java java $DEPLOY_DIR/jre/bin/java 200000 >> setup_java.log 2>&1
@@ -573,7 +590,7 @@ if $INSTALL_JAVA; then
alternatives --install /usr/bin/jar jar $DEPLOY_DIR/jdk/bin/jar 200000 >> setup_java.log 2>&1
echo " - exporting java options"
- echo "export JAVA_HOME=$DEPLOY_DIR/jre" > /etc/profile.d/java.sh
+ echo "export JAVA_HOME=$DEPLOY_DIR/jre" >> /etc/profile.d/java.sh
echo "export PATH=\${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/java.sh
source /etc/profile.d/java.sh
@@ -584,20 +601,20 @@ fi
if $INSTALL_TOMCAT; then
echo "Installing $TOMCAT_NAME $TOMCAT_VERSION servlet container"
-# yum -y install $TOMCAT_NAME $TOMCAT_NAME-webapps $TOMCAT_NAME-admin-webapps > install_tomcat.log 2>&1
+# yum -y install $TOMCAT_NAME $TOMCAT_NAME-webapps $TOMCAT_NAME-admin-webapps >> install_tomcat.log 2>&1
# ln -sf /usr/share/$TOMCAT_NAME $DEPLOY_DIR/$TOMCAT_NAME
fn_download_newer $DOWNLOAD_DIR/$TOMCAT_FILE $TOMCAT_DOWNLOAD_URL
cp $DOWNLOAD_DIR/$TOMCAT_FILE $DEPLOY_DIR/$TOMCAT_FILE
- tar -xvzf $DEPLOY_DIR/$TOMCAT_FILE -C $DEPLOY_DIR > install_tomcat.log 2>&1
+ tar -xvzf $DEPLOY_DIR/$TOMCAT_FILE -C $DEPLOY_DIR >> install_tomcat.log 2>&1
rm -f $DEPLOY_DIR/$TOMCAT_FILE >> install_tomcat.log 2>&1
ln -sf $DEPLOY_DIR/apache-tomcat-$TOMCAT_VERSION $DEPLOY_DIR/$TOMCAT_NAME >> install_tomcat.log 2>&1
echo " - exporting catalina options"
if $INSTALL_GEOSERVER; then
- echo "export CATALINA_OPTS=\"-Djava.awt.headless=true $TOMCAT_MEMORY_OPTS -DGEOSERVER_DATA_DIR=$DEPLOY_DIR/geoserver/data\"" > /etc/profile.d/catalina.sh
+ echo "export CATALINA_OPTS=\"-Djava.awt.headless=true $TOMCAT_MEMORY_OPTS -DGEOSERVER_DATA_DIR=$DEPLOY_DIR/geoserver/data\"" >> /etc/profile.d/catalina.sh
else
- echo "export CATALINA_OPTS=\"-Djava.awt.headless=true $TOMCAT_MEMORY_OPTS\"" > /etc/profile.d/catalina.sh
+ echo "export CATALINA_OPTS=\"-Djava.awt.headless=true $TOMCAT_MEMORY_OPTS\"" >> /etc/profile.d/catalina.sh
fi
source /etc/profile.d/catalina.sh
fi
@@ -605,7 +622,7 @@ fi
if $INSTALL_GEOSERVER; then
echo "Installing geoserver $GEOSERVER_VERSION"
fn_download_newer $DOWNLOAD_DIR/$GEOSERVER_FILE $GEOSERVER_DOWNLOAD_URL
- unzip -o -d $TOMCAT_WEBAPP_DIR $DOWNLOAD_DIR/$GEOSERVER_FILE geoserver.war > install_geoserver.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR $DOWNLOAD_DIR/$GEOSERVER_FILE geoserver.war >> install_geoserver.log 2>&1
echo " - copying web archive into tomcat"
mkdir -p $TOMCAT_WEBAPP_DIR/geoserver
@@ -619,7 +636,7 @@ if $INSTALL_GEOSERVER; then
echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION"
fn_download_newer $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE $CACHE_DIR_REMOTE/$GEOSERVER_SHELL_FILE
- unzip $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE -d $DEPLOY_DIR > install_geoserver_shell.log 2>&1
+ unzip $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE -d $DEPLOY_DIR >> install_geoserver_shell.log 2>&1
ln -sf $DEPLOY_DIR/gs-shell-0.2-SNAPSHOT $DEPLOY_DIR/gs-shell
make >> install_geoserver_shell.log 2>&1
make install >> install_geoserver_shell.log 2>&1
@@ -629,7 +646,7 @@ if $INSTALL_ISOCHRONE_LOCAL; then
echo "Installing template project \"isochrone (local testing)\""
echo " - creating war using gradle from $TEMPLATE_DIR_ISOCHRONE"
- $TEMPLATE_DIR_ISOCHRONE/gradlew -b $TEMPLATE_DIR_ISOCHRONE/build.gradle -c $TEMPLATE_DIR_ISOCHRONE/settings.gradle clean war > install_isochrone_local.log 2>&1
+ $TEMPLATE_DIR_ISOCHRONE/gradlew -b $TEMPLATE_DIR_ISOCHRONE/build.gradle -c $TEMPLATE_DIR_ISOCHRONE/settings.gradle clean war >> install_isochrone_local.log 2>&1
unzip -o -d $TOMCAT_WEBAPP_DIR/localTesting $TEMPLATE_DIR_ISOCHRONE/build/libs/isochrone-*.war >> install_isochrone_local.log 2>&1
fi
@@ -640,7 +657,7 @@ if $INSTALL_ISOCHRONE_RELEASE; then
# we do not save this file in download dir (we do not want caching for isochrone.war)
fn_download $DOWNLOAD_DIR/isochrone.war $NEXUS_RELEASE_ISOCHRONE
cp $DOWNLOAD_DIR/isochrone.war $TOMCAT_WEBAPP_DIR/isochrone.war
- unzip -o -d $TOMCAT_WEBAPP_DIR/isochrone $TOMCAT_WEBAPP_DIR/isochrone.war > install_isochrone_release.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR/isochrone $TOMCAT_WEBAPP_DIR/isochrone.war >> install_isochrone_release.log 2>&1
rm -f $TOMCAT_WEBAPP_DIR/isochrone.war >> install_isochrone_release.log 2>&1
fi
@@ -651,7 +668,7 @@ if $INSTALL_ISOCHRONE_SNAPSHOT; then
# we do not save this file in download dir (we do not want caching for testing.war)
fn_download $DOWNLOAD_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE
cp $DOWNLOAD_DIR/testing.war $TOMCAT_WEBAPP_DIR/testing.war
- unzip -o -d $TOMCAT_WEBAPP_DIR/testing $TOMCAT_WEBAPP_DIR/testing.war > install_isochrone_snapshot.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR/testing $TOMCAT_WEBAPP_DIR/testing.war >> install_isochrone_snapshot.log 2>&1
rm -f $TOMCAT_WEBAPP_DIR/testing.war >> install_isochrone_snapshot.log 2>&1
fi
@@ -661,7 +678,7 @@ if $INSTALL_PROJECT_CANIGET2; then
fn_download_newer $DOWNLOAD_DIR/caniget2.war $NEXUS_RELEASE_CANIGET2
cp $DOWNLOAD_DIR/caniget2.war $TOMCAT_WEBAPP_DIR
- unzip -o -d $TOMCAT_WEBAPP_DIR/caniget2 $TOMCAT_WEBAPP_DIR/caniget2.war > install_caniget2.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR/caniget2 $TOMCAT_WEBAPP_DIR/caniget2.war >> install_caniget2.log 2>&1
rm -f $TOMCAT_WEBAPP_DIR/caniget2.war >> install_caniget2.log 2>&1
fi
@@ -671,7 +688,7 @@ if $INSTALL_PROJECT_PSIPROBE; then
fn_download_newer $DOWNLOAD_DIR/$TEMPLATE_PSIPROBE_FILE "$TEMPLATE_PSIPROBE_DOWNLOAD_URL"
unzip $DOWNLOAD_DIR/$TEMPLATE_PSIPROBE_FILE probe.war -d $TOMCAT_WEBAPP_DIR
- unzip -o -d $TOMCAT_WEBAPP_DIR/psiprobe $TOMCAT_WEBAPP_DIR/probe.war > install_psiprobe.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR/psiprobe $TOMCAT_WEBAPP_DIR/probe.war >> install_psiprobe.log 2>&1
rm -f $TOMCAT_WEBAPP_DIR/probe.war >> install_psiprobe.log 2>&1
fi
@@ -679,11 +696,11 @@ if $INSTALL_MAVEN; then
echo "Installing maven $MAVEN_VERSION"
mkdir -p $CACHE_DIR_LOCAL/maven
fn_download_newer $DOWNLOAD_DIR/$MAVEN_FILE "$MAVEN_DOWNLOAD_URL"
- unzip -o $DOWNLOAD_DIR/$MAVEN_FILE -d $DEPLOY_DIR > install_maven.log 2>&1
+ unzip -o $DOWNLOAD_DIR/$MAVEN_FILE -d $DEPLOY_DIR >> install_maven.log 2>&1
ln -sf $DEPLOY_DIR/apache-maven-$MAVEN_VERSION $DEPLOY_DIR/apache-maven
echo " - exporting maven options"
- echo "export M2_HOME=$DEPLOY_DIR/apache-maven" > /etc/profile.d/maven.sh
+ echo "export M2_HOME=$DEPLOY_DIR/apache-maven" >> /etc/profile.d/maven.sh
echo "export PATH=\${M2_HOME}/bin:\${PATH}" >> /etc/profile.d/maven.sh
source /etc/profile.d/maven.sh
@@ -695,11 +712,11 @@ fi
if $INSTALL_NEO4J; then
echo "Installing neo4j dependencies"
- yum install -y lsof > install_neo4j_deps.log 2>&1
+ yum install -y lsof >> install_neo4j_deps.log 2>&1
echo "Installing neo4j $NEO4J_VERSION"
fn_download_newer $DOWNLOAD_DIR/$NEO4J_FILE "$NEO4J_DOWNLOAD_URL"
- tar -xvzf $DOWNLOAD_DIR/$NEO4J_FILE -C $DEPLOY_DIR > install_neo4j.log 2>&1
+ tar -xvzf $DOWNLOAD_DIR/$NEO4J_FILE -C $DEPLOY_DIR >> install_neo4j.log 2>&1
ln -sf $DEPLOY_DIR/neo4j-community-$NEO4J_VERSION $DEPLOY_DIR/neo4j
echo " - enabling neo4j network access"
@@ -711,18 +728,18 @@ if $INSTALL_NEO4J_SPATIAL; then
git clone -q "$NEO4J_SPATIAL_GIT_URL" $DEPLOY_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION
ln -sf $DEPLOY_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION $DEPLOY_DIR/neo4j-spatial
cd $DEPLOY_DIR/neo4j-spatial
- git checkout -q $NEO4J_SPATIAL_VERSION > /dev/null 2>&1
+ git checkout -q $NEO4J_SPATIAL_VERSION >> /dev/null 2>&1
if $INSTALL_GEOSERVER; then
if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
# We need to compile the source when importing data, so that the main class gets compiled
echo " - copying neo4j-spatial into geoserver (from source)"
- mvn clean install -DskipTests > $WORKING_DIR/install_neo4j_spatial.log 2>&1
- unzip -o $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+ mvn clean install -DskipTests >> $WORKING_DIR/install_neo4j_spatial.log 2>&1
+ unzip -o $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
else
echo " - copying neo4j-spatial into geoserver (from binary)"
fn_download_newer $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip "$NEO4J_SPATIAL_PLUGIN_DOWNLOAD_URL"
- unzip -o $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib > $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+ unzip -o $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
fi
fi
cd $WORKING_DIR
@@ -732,22 +749,22 @@ if $IMPORT_OSMDATA; then
echo "Installing osmosis $OSMOSIS_VERSION"
fn_download_newer $DOWNLOAD_DIR/$OSMOSIS_FILE "$OSMOSIS_DOWNLOAD_URL"
mkdir -p $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION
- unzip -o $DOWNLOAD_DIR/$OSMOSIS_FILE -d $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION > install_osmosis.log 2>&1
+ unzip -o $DOWNLOAD_DIR/$OSMOSIS_FILE -d $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION >> install_osmosis.log 2>&1
ln -sf $DEPLOY_DIR/osmosis-* $DEPLOY_DIR/osmosis
chmod a+x $DEPLOY_DIR/osmosis/bin/osmosis
fi
if ( $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED ) && $INSTALL_PGROUTING; then
echo "Installing osm2pgrouting dependencies"
- yum install -y expat-devel boost-devel > install_osm2pgrouting_deps.log 2>&1
+ yum install -y expat-devel boost-devel >> install_osm2pgrouting_deps.log 2>&1
echo "Installing osm2pgrouting $OSM2PGROUTING_VERSION"
git clone -q "$OSM2PGROUTING_GIT_URL" $DEPLOY_DIR/osm2pgrouting-$OSM2PGROUTING_VERSION
ln -sf $DEPLOY_DIR/osm2pgrouting-$OSM2PGROUTING_VERSION $DEPLOY_DIR/osm2pgrouting
cd $DEPLOY_DIR/osm2pgrouting
- git checkout -q $OSM2PGROUTING_VERSION > /dev/null 2>&1
- cmake -H. -Bbuild > $WORKING_DIR/install_osm2pgrouting.log 2>&1
+ git checkout -q $OSM2PGROUTING_VERSION >> /dev/null 2>&1
+ cmake -H. -Bbuild >> $WORKING_DIR/install_osm2pgrouting.log 2>&1
cd build/
make >> $WORKING_DIR/install_osm2pgrouting.log 2>&1
make install >> $WORKING_DIR/install_osm2pgrouting.log 2>&1
@@ -763,9 +780,9 @@ if $INSTALL_POSTGRES; then
echo "Initializing postgresql database"
if [ -f "$PostgreSQL_ROOT/bin/postgresql93-setup" ]; then
rm -rf $POSTGRESQL_DATA_DIR
- $PostgreSQL_ROOT/bin/postgresql93-setup initdb > initialize_postgresql.log 2>&1
+ $PostgreSQL_ROOT/bin/postgresql93-setup initdb >> initialize_postgresql.log 2>&1
else
- service $POSTGRESQL_SERVICE_NAME initdb > initialize_postgresql.log 2>&1
+ service $POSTGRESQL_SERVICE_NAME initdb >> initialize_postgresql.log 2>&1
fi
sleep 2
@@ -783,7 +800,7 @@ fi
if $INSTALL_NEO4J; then
echo "Initializing neo4j database"
- $DEPLOY_DIR/neo4j/bin/neo4j -h -u $NEO4J_DB_USER install > initialize_neo4j.log 2>&1
+ $DEPLOY_DIR/neo4j/bin/neo4j -h -u $NEO4J_DB_USER install >> initialize_neo4j.log 2>&1
echo " - setting max open file limit for neo4j user"
echo "$NEO4J_DB_USER soft nofile 40000" >> /etc/security/limits.conf
@@ -852,7 +869,7 @@ fi
if $INSTALL_POSTGRES; then
echo "Creating postgresql database $PG_DB_NAME"
- sudo -u "postgres" psql -d template1 -c "CREATE DATABASE \"$PG_DB_NAME\";" > $WORKING_DIR/setup_database.log 2>&1
+ sudo -u "postgres" psql -d template1 -c "CREATE DATABASE \"$PG_DB_NAME\";" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u "postgres" psql -d "$PG_DB_NAME" -c "CREATE USER \"$PG_DB_USER\" WITH PASSWORD '$PG_DB_PASSWORD';" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u "postgres" psql -d "$PG_DB_NAME" -c "ALTER DATABASE \"$PG_DB_NAME\" OWNER TO \"$PG_DB_USER\";" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u "postgres" psql -d "$PG_DB_NAME" -c "GRANT ALL PRIVILEGES ON DATABASE \"$PG_DB_NAME\" TO \"$PG_DB_USER\";" >> $WORKING_DIR/setup_database.log 2>&1
@@ -891,12 +908,12 @@ if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
fi
echo "Configuring geoserver $GEOSERVER_VERSION using geoserver-shell $GEOSERVER_SHELL_VERSION"
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_ws.gs > setup_geoserver_workspace.log 2>&1
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_styles.gs > setup_geoserver_styles.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_ws.gs >> setup_geoserver_workspace.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_styles.gs >> setup_geoserver_styles.log 2>&1
cp $SHARED_IMG_DIR/* $DEPLOY_DIR/geoserver/data/styles >> setup_geoserver_styles.log 2>&1
if $INSTALL_NEO4J_SPATIAL; then
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ds.gs > setup_geoserver_neo4j.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ds.gs >> setup_geoserver_neo4j.log 2>&1
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
if ! $IS_LOCAL_TEST_DEPLOY; then
@@ -912,7 +929,7 @@ if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
sed -i "s/@db_username@/$PG_DB_USER/" $WORKING_DIR/geoserver_setup_postgis_ds.gs
sed -i "s/@db_password@/$PG_DB_PASSWORD/" $WORKING_DIR/geoserver_setup_postgis_ds.gs
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $WORKING_DIR/geoserver_setup_postgis_ds.gs > setup_geoserver_postgis.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $WORKING_DIR/geoserver_setup_postgis_ds.gs >> setup_geoserver_postgis.log 2>&1
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
if ! $IS_LOCAL_TEST_DEPLOY; then
--
GitLab