Skip to content
Snippets Groups Projects
Commit d458d2fa authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

changed tomcat memory options (extracted parameter and increased usable

memory)
parent 9c6e6a0c
No related branches found
No related tags found
No related merge requests found
...@@ -143,6 +143,7 @@ TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip ...@@ -143,6 +143,7 @@ TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip
TEMPLATE_DIR_ISOCHRONE=/vagrant TEMPLATE_DIR_ISOCHRONE=/vagrant
TOMCAT_VERSION=7.0.54 TOMCAT_VERSION=7.0.54
TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=512m"
TOMCAT_NAME=tomcat TOMCAT_NAME=tomcat
TOMCAT_USER=tomcat TOMCAT_USER=tomcat
TOPOLOGY_TOLERANCE=0.0005 TOPOLOGY_TOLERANCE=0.0005
...@@ -498,7 +499,7 @@ if $INSTALL_GEOSERVER; then ...@@ -498,7 +499,7 @@ if $INSTALL_GEOSERVER; then
# mkdir -p $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1 # mkdir -p $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1
# mv $TOMCAT_WEBAPP_DIR/geoserver/data $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1 # mv $TOMCAT_WEBAPP_DIR/geoserver/data $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1
mkdir -p $DEPLOY_DIR/geoserver/data >> install_geoserver.log 2>&1 mkdir -p $DEPLOY_DIR/geoserver/data >> install_geoserver.log 2>&1
echo "export CATALINA_OPTS=\"-Djava.awt.headless=true -Xmx512m -Xms128m -XX:MaxPermSize=128m -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
source /etc/profile.d/catalina.sh source /etc/profile.d/catalina.sh
echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION" echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment