- set default values of env variables in init, not in sysconfig

- export variables
- CATALINA_OPTS+=-Djava.library.path=/usr/lib64:/usr/lib

Changed files:
    apache-tomcat.init -> 1.17

diff --git a/apache-tomcat.init b/apache-tomcat.init
index c55eda278ac2cd617c6c220c65aa24bb77785215..d06c6199686a281d1b34b8b95cefc016b26ae7bf 100644 (file)
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -15,9 +15,18 @@
 # Get network config
 . /etc/sysconfig/network
 
+CATALINA_BASE=/var/lib/tomcat
+CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m -Djava.library.path=/usr/lib64:/usr/lib"
+JAVA_HOME=$(. /usr/share/java-utils/java-functions; set_jvm >&2; echo "$JAVA_HOME")
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat
 
+export CATALINA_BASE
+export CATALINA_OPTS
+export JAVA_OPTS
+export JAVA_HOME
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then