Author: pawelz Date: Fri Dec 11 16:40:19 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- set default values of env variables in init, not in sysconfig
- export variables
- CATALINA_OPTS+=-Djava.library.path=/usr/lib64:/usr/lib
---- Files affected:
packages/tomcat:
apache-tomcat.init (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/tomcat/apache-tomcat.init
diff -u packages/tomcat/apache-tomcat.init:1.16
packages/tomcat/apache-tomcat.init:1.17
--- packages/tomcat/apache-tomcat.init:1.16 Tue Nov 24 09:37:05 2009
+++ packages/tomcat/apache-tomcat.init Fri Dec 11 17:40:14 2009
@@ -15,8 +15,17 @@
# 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.init?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
