diff --git a/Vagrantfile b/Vagrantfile
index 35d9aae555a4429b0405416c45b1d01de4ec5fc0..34a491513709cb7153fe7a0dc158a0a67b4c4e0a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,6 +9,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.cache.enable :yum
end
+ config.vm.synced_folder "etc/vagrant/conf", "/setup/conf"
+ config.vm.synced_folder "etc/vagrant/img", "/setup/img"
config.vm.provision "shell", path: "etc/vagrant/bootstrap.sh", args: ["niko", "secretPhdPassword#2014!"]
config.vm.box = "centos64-x86_64"
config.vm.box_url = "http://www.krismer.de/files/VM/centos64-x86_64.box"
diff --git a/etc/vagrant/.gitignore b/etc/vagrant/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..44495a831d410e16c1bfac02f7595fe8c8e21487
--- /dev/null
+++ b/etc/vagrant/.gitignore
@@ -0,0 +1 @@
+/.vagrant
\ No newline at end of file
diff --git a/etc/vagrant/Vagrantfile b/etc/vagrant/Vagrantfile
index 388280f068d22721a32d07312086551bc007d969..67eca861751e15416be06226dd9387d477b30766 100644
--- a/etc/vagrant/Vagrantfile
+++ b/etc/vagrant/Vagrantfile
@@ -10,6 +10,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.cache.enable :yum
end
+ # Setup of shared folders
+ config.vm.synced_folder "vagrant/conf", "/setup/conf"
+ config.vm.synced_folder "vagrant/img", "/setup/img"
+
# Setup environment on startup (done using a shell script)
config.vm.provision "shell", path: "bootstrap.sh"
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 9e99a538594fee28778db2fb90cd4d161c98a717..65a21e91a016a79c01d337d9d04e74083338f899 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -39,7 +39,7 @@ if [ ${PG_DB_USER:0:1} == "@" ]; then
PG_DB_USER=$1
fi
if [ ${PG_DB_PASSWORD:0:1} == "@" ]; then
- PG_DB_USER=$2
+ PG_DB_PASSWORD=$2
fi
###########################
@@ -50,8 +50,8 @@ 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=/vagrant/conf
-SHARED_IMG_DIR=/vagrant/img
+SHARED_CONF_DIR=/setup/conf
+SHARED_IMG_DIR=/setup/img
CMAKE_VERSION=2.8.12.1
CMAKE_VERSION_MAIN=v2.8
@@ -94,7 +94,7 @@ REPO_RPMFORGE_CONFIG=/etc/yum.repos.d/rpmforge.repo
TABLE_PREFIX_BZ=bz_
TABLE_PREFIX_IBK=ibk_
TEMPLATE_PROJECT_FILE=$NEXUS_PATH/de/krismer/CanIGet2/0.1/CanIGet2-0.1.war
-TOMCAT_VERSION=7.0.47
+TOMCAT_VERSION=7.0.50
TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
TOMCAT_NAME=tomcat
TOMCAT_USER=tomcat
@@ -127,8 +127,6 @@ DISTRI=$(cat /etc/issue | head -n 1 | cut -d " " -f 1)
if [ $DISTRI == "CentOS" ]; then
POSTGRESQL_REPO_RPM=http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-1.noarch.rpm
REPO_BASE_CONFIG=/etc/yum.repos.d/CentOS-Base.repo
-# TOMCAT_VERSION=6
-# TOMCAT_NAME=tomcat6
elif [ $DISTRI != "Fedora" ]; then
echo "Unsupported OS. Only CentOS and Fedora are supported!"
exit 1;
@@ -236,6 +234,7 @@ if $INSTALL_POSTGRES_ADMIN; then echo " - phpPgAdmin"; fi
if $IMPORT_OSMDATA; then echo " - osmosis $OSMOSIS_VERSION"; fi
if $IMPORT_OSMDATA_CACHED; then echo "Importing cached data from OSM (if possible)"; elif $IMPORT_OSMDATA; then echo "Importing data from OSM"; fi
if $IMPORT_SCHEDULES; then echo "Importing schedules"; fi
+if $INSTALL_TEMPLATE_PROJECT; then echo "Importing template project \"CanIGet2\""; fi
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo " Performing installations:"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -555,7 +554,7 @@ fi
if $INSTALL_POSTGIS && $INSTALL_GEOSERVER; then
echo "Configuring geoserver epsg projections"
mkdir -p $DEPLOY_DIR/geoserver/data/user_projections
- echo "82344=`grep ^[^//,^#] /vagrant/conf/srid_82344_wkt.txt | paste -sd "" | sed 's/ \+ / /g'`" >> $DEPLOY_DIR/geoserver/data/user_projections/epsg.properties
+ echo "82344=`grep ^[^//,^#] /setup/conf/srid_82344_wkt.txt | paste -sd "" | sed 's/ \+ / /g'`" >> $DEPLOY_DIR/geoserver/data/user_projections/epsg.properties
chown -R $TOMCAT_USER:$TOMCAT_USER $DEPLOY_DIR/geoserver/data/user_projections
fi
diff --git a/etc/vagrant/conf/geoserver_setup_styles.gs b/etc/vagrant/conf/geoserver_setup_styles.gs
index 6f7c828abbe2db8c8bf50aa6ac285a3771e8194d..a15d49093ced21c72a07402f46584c11fb2803e3 100644
--- a/etc/vagrant/conf/geoserver_setup_styles.gs
+++ b/etc/vagrant/conf/geoserver_setup_styles.gs
@@ -1,7 +1,7 @@
geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
-style create --file @shared_conf_dir@/geoserver_style_edge.sld --name StyleEdge
-style create --file @shared_conf_dir@/geoserver_style_edgeexpiration.sld --name StyleEdgeExpiration
-style create --file @shared_conf_dir@/geoserver_style_isocoverage.sld --name StyleIsoCoverage
-style create --file @shared_conf_dir@/geoserver_style_stations.sld --name StyleTransportationStations
-style create --file @shared_conf_dir@/geoserver_style_vertexexpiration.sld --name StyleVertexExpiration
+style create --file /setup/conf/geoserver_style_edge.sld --name StyleEdge
+style create --file /setup/conf/geoserver_style_edgeexpiration.sld --name StyleEdgeExpiration
+style create --file /setup/conf/geoserver_style_isocoverage.sld --name StyleIsoCoverage
+style create --file /setup/conf/geoserver_style_stations.sld --name StyleTransportationStations
+style create --file /setup/conf/geoserver_style_vertexexpiration.sld --name StyleVertexExpiration
diff --git a/etc/vagrant/conf/geoserver_style_stations.sld b/etc/vagrant/conf/geoserver_style_stations.sld
index 09a83bfab398ffc5b51d53c68a1f847a12dc6bbe..5190b3e7444c7b8bb7c86dbadde00ca928cc5d83 100644
--- a/etc/vagrant/conf/geoserver_style_stations.sld
+++ b/etc/vagrant/conf/geoserver_style_stations.sld
@@ -20,7 +20,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/tram.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/tram.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -44,7 +44,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/railway.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/railway.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -69,7 +69,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/bus.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/bus.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -94,7 +94,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/ferry.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/ferry.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>