added installation of phpLiteAdmin and spatialite

.gitignore

@@ -3,5 +3,6 @@
 /.project
 /.settings
 /.vagrant
+/data
 /home
-/log
+/log
\ No newline at end of file

Vagrantfile

@@ -55,6 +55,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Setup of shared folders
   config.vm.synced_folder "conf", "/setup/conf"
+  config.vm.synced_folder "data", "/opt/data", create: true
   config.vm.synced_folder "img", "/setup/img"
   config.vm.synced_folder "log/postgresql", "/var/log/postgresql", create: true, owner: 26, group: 26
   config.vm.synced_folder "log/bootstrap", "/var/log/vagrant_bootstrap", create: true, owner: "vagrant", group: "vagrant"

bootstrap/config.sh

@@ -25,10 +25,13 @@ INSTALL_POSTGIS=true
 INSTALL_POSTGRES=true
 INSTALL_POSTGRES_ADMIN=true
 INSTALL_PROJECT_PSIPROBE=true
+INSTALL_SPATIALITE=false
+INSTALL_SPATIALITE_ADMIN=true
 
 CACHE_DIR_LOCAL="/tmp/vagrant-cache"
 CACHE_DIR_REMOTE="http://dbis-informatik.uibk.ac.at/static/ma/niko/isochrone"
 DEPLOY_DIR="/opt"
+DATA_DIR="$DEPLOY_DIR/data"
 SETUP_DIR="/setup"
 WORKING_DIR="/var/log/vagrant_bootstrap"
 
@@ -57,6 +60,7 @@ AVAILABLE_NEO4J_SPATIAL=$([ -d "${DEPLOY_DIR}/neo4j-spatial" ] && echo true || e
 AVAILABLE_POSTGRES=$(type ${EXEC_POSTGRES} >/dev/null 2>&1 && echo true || echo false)
 AVAILABLE_POSTGIS=$([ -f "${POSTGRES_SHARE}/extension/postgis.control" ] && echo true || echo false)
 AVAILABLE_PGROUTING=$([ -f "${POSTGRES_SHARE}/extension/pgrouting.control" ] && echo true || echo false)
+AVAILABLE_SPATIALITE_ADMIN=$([ -f "$DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php" ] && echo true || echo false)
 
 DOWNLOAD_DIR="${CACHE_DIR_LOCAL}/wget"
 if [ ! -f "${SETUP_DIR}" ]; then

bootstrap/importData.sh

@@ -68,10 +68,10 @@ fn_import_data() {
 	if $VALID_SQL; 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
+		cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_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
+		gunzip -c $DATA_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 "  - getting 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"`
@@ -89,10 +89,10 @@ fn_import_data() {
 	if $IMPORT_DATA_OSM_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 $DATA_DIR/$OSM_FILE_FILTERED >> /dev/null 2>&1
 	fi
 
-	if [ ! -f $DEPLOY_DIR/$OSM_FILE_FILTERED ]; then
+	if [ ! -f $DATA_DIR/$OSM_FILE_FILTERED ]; then
 		if $IMPORT_DATA_OSM; then
 			echo "  - downloading OpenStreetMap file (no cached file found)"
 			OSM_FILENAME=$DOWNLOAD_DIR/${OSM_FILE##*/}
@@ -100,9 +100,9 @@ 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_osmData_$NAME.log" 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="$DATA_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_osmData_$NAME.log" 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="$DATA_DIR/$OSM_FILE_FILTERED" >> "initialize_osmData_$NAME.log" 2>&1
 			fi
 		else
 			echo "  - problems with downloading cached osm file... this will most likely lead cause errors"		
@@ -111,7 +111,7 @@ fn_import_data() {
 
 	if $AVAILABLE_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_$NAME.log" 2>&1
+		$DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DATA_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_$NAME.log" 2>&1
@@ -120,7 +120,7 @@ fn_import_data() {
 	if $AVAILABLE_NEO4J_SPATIAL; then
 		echo "  - importing filtered OpenStreetMap data into neo4j-spatial"
 		cd $DEPLOY_DIR/neo4j-spatial
-		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
+		mvn exec:java -Dexec.mainClass=org.neo4j.gis.spatial.osm.OSMImporter -Dexec.args="$DEPLOY_DIR/neo4j/data/graph.db $DATA_DIR/$OSM_FILE_FILTERED" >> $WORKING_DIR/import_osm2neo4j.log 2>&1
 		cd $WORKING_DIR
 	fi
 
@@ -196,6 +196,17 @@ if $AVAILABLE_GEOSERVER; then
 	fi
 fi
 
+if $AVAILABLE_SPATIALITE_ADMIN; then
+	echo "Importing spatialite database"
+	fn_download_newer $DOWNLOAD_DIR/isochrone.db $CACHE_DIR_REMOTE/201505_spatialite.db
+
+	cp $DOWNLOAD_DIR/isochrone.db $DATA_DIR/isochrone.db
+
+	echo "  - setting spatialite database permissions"
+	chown -R apache:apache $DATA_DIR/isochrone.db
+	chmod -R -g+rwX $DATA_DIR/isochrone.db
+fi
+
 END=$(date +%s)
 TOTAL=$(( $END - $START ))