From eb70ffebfcdcfafaf03cd3c803915baa0c72b64a Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Wed, 18 Dec 2013 11:25:23 +0100
Subject: [PATCH] fixed problem in tomcat startscript added JAVA_HOME variable
to environment
---
etc/vagrant/bootstrap.sh | 10 +++++++---
etc/vagrant/conf/tomcat_startscript.sh | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 0de7b5f8..396d95c2 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -84,7 +84,7 @@ 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_FILE=apache-tomcat-$TOMCAT_VERSION.zip
+TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
TOMCAT_NAME=tomcat
TOMCAT_USER=tomcat
TOPOLOGY_TOLERANCE=0.0005
@@ -311,7 +311,7 @@ if $INSTALL_PGROUTING; then
# echo "Installing cmake $CMAKE_VERSION from source"
# fn_download_newer $DOWNLOAD_DIR/$CMAKE_FILE http://www.cmake.org/files/$CMAKE_VERSION_MAIN/$CMAKE_FILE
# cp $DOWNLOAD_DIR/$CMAKE_FILE $DEPLOY_DIR/$CMAKE_FILE
-# tar xvzf $DEPLOY_DIR/$CMAKE_FILE -C $DEPLOY_DIR > install_cmake.log 2>&1
+# tar -xvzf $DEPLOY_DIR/$CMAKE_FILE -C $DEPLOY_DIR > install_cmake.log 2>&1
# cd $DEPLOY_DIR/cmake*
# ./bootstrap >> install_cmake.log 2>&1
# make >> install_cmake.log 2>&1
@@ -366,6 +366,10 @@ if $INSTALL_JAVA; then
alternatives --set java $DEPLOY_DIR/jre/bin/java >> setup_java.log 2>&1
alternatives --install /usr/bin/javac javac $DEPLOY_DIR/jdk/bin/javac 200000 >> setup_java.log 2>&1
alternatives --install /usr/bin/jar jar $DEPLOY_DIR/jdk/bin/jar 200000 >> setup_java.log 2>&1
+
+ 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
fi
if $INSTALL_TOMCAT; then
@@ -375,7 +379,7 @@ if $INSTALL_TOMCAT; then
fn_download_newer $DOWNLOAD_DIR/$TOMCAT_FILE http://tweedo.com/mirror/apache/tomcat/tomcat-7/v$TOMCAT_VERSION/bin/$TOMCAT_FILE
cp $DOWNLOAD_DIR/$TOMCAT_FILE $DEPLOY_DIR/$TOMCAT_FILE
- unzip -o -d $DEPLOY_DIR $DEPLOY_DIR/$TOMCAT_FILE > install_tomcat.log 2>&1
+ tar -xvzf $DEPLOY_DIR/$TOMCAT_FILE -C $DEPLOY_DIR > install_tomcat.log 2>&1
ln -sf $DEPLOY_DIR/apache-tomcat-$TOMCAT_VERSION $DEPLOY_DIR/$TOMCAT_NAME >> install_tomcat.log 2>&1
groupadd -g 521 $TOMCAT_USER >> install_tomcat.log 2>&1
diff --git a/etc/vagrant/conf/tomcat_startscript.sh b/etc/vagrant/conf/tomcat_startscript.sh
index 745777d1..ea2f0d7e 100644
--- a/etc/vagrant/conf/tomcat_startscript.sh
+++ b/etc/vagrant/conf/tomcat_startscript.sh
@@ -9,8 +9,8 @@
. /etc/init.d/functions
#. /etc/sysconfig/network
-CATALINA_HOME=/opt/apache-tomcat-7.0.39
-CATALINA_BASE=/opt/apache-tomcat-7.0.39
+CATALINA_HOME=/opt/tomcat
+CATALINA_BASE=/opt/tomcat
TOMCAT_USER=tomcat
LOCKFILE=/var/lock/subsys/tomcat
--
GitLab