|
Lines 58-63
Link Here
|
| 58 |
# Set to "30" by default. |
58 |
# Set to "30" by default. |
| 59 |
# Set the wait time (in seconds) for Tomcat process startup |
59 |
# Set the wait time (in seconds) for Tomcat process startup |
| 60 |
# |
60 |
# |
|
|
61 |
# tomcat7_umask (str): |
| 62 |
# Set to "0077" by default. |
| 63 |
# Sets the umask for Tomcat process. |
| 64 |
# |
| 61 |
# You may symlink this script with other names to run multiple |
65 |
# You may symlink this script with other names to run multiple |
| 62 |
# instances of tomcat7 with different configurations. |
66 |
# instances of tomcat7 with different configurations. |
| 63 |
# |
67 |
# |
|
Lines 94-99
Link Here
|
| 94 |
eval "_tomcat_classpath=\${${name}_classpath:-''}" |
98 |
eval "_tomcat_classpath=\${${name}_classpath:-''}" |
| 95 |
eval "_tomcat_java_opts=\${${name}_java_opts:-''}" |
99 |
eval "_tomcat_java_opts=\${${name}_java_opts:-''}" |
| 96 |
eval "_tomcat_wait=\${${name}_wait:-'30'}" |
100 |
eval "_tomcat_wait=\${${name}_wait:-'30'}" |
|
|
101 |
eval "_tomcat_umask=\${${name}_umask:-'0077'}" |
| 97 |
|
102 |
|
| 98 |
pidfile="/var/run/${name}.pid" |
103 |
pidfile="/var/run/${name}.pid" |
| 99 |
|
104 |
|
|
Lines 102-111
Link Here
|
| 102 |
|
107 |
|
| 103 |
extra_commands="reload" |
108 |
extra_commands="reload" |
| 104 |
|
109 |
|
|
|
110 |
_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` |
| 111 |
|
| 112 |
case "${_tomcat_java_version}" in |
| 113 |
9* | 1[0-9]* ) |
| 114 |
_tomcat_endorsed_dirs_option= |
| 115 |
;; |
| 116 |
*) |
| 117 |
_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='%%TOMCAT_HOME%%/endorsed'" |
| 118 |
;; |
| 119 |
esac |
| 120 |
|
| 105 |
command="%%LOCALBASE%%/bin/jsvc" |
121 |
command="%%LOCALBASE%%/bin/jsvc" |
| 106 |
command_args="-java-home '${_tomcat_java_home}' \ |
122 |
command_args="-java-home '${_tomcat_java_home}' \ |
| 107 |
-server \ |
123 |
-server \ |
| 108 |
-user ${_tomcat_catalina_user} \ |
124 |
-user ${_tomcat_catalina_user} \ |
|
|
125 |
-umask ${_tomcat_umask} \ |
| 109 |
-pidfile '${pidfile}' \ |
126 |
-pidfile '${pidfile}' \ |
| 110 |
-wait ${_tomcat_wait} \ |
127 |
-wait ${_tomcat_wait} \ |
| 111 |
-outfile '${_tomcat_stdout}' \ |
128 |
-outfile '${_tomcat_stdout}' \ |
|
Lines 114-120
Link Here
|
| 114 |
-Djava.util.logging.manager=${_tomcat_logging_manager} \ |
131 |
-Djava.util.logging.manager=${_tomcat_logging_manager} \ |
| 115 |
-Djava.util.logging.config.file='${_tomcat_logging_config}' \ |
132 |
-Djava.util.logging.config.file='${_tomcat_logging_config}' \ |
| 116 |
${_tomcat_java_opts} \ |
133 |
${_tomcat_java_opts} \ |
| 117 |
-Djava.endorsed.dirs='%%TOMCAT_HOME%%/endorsed' \ |
134 |
${_tomcat_endorsed_dirs_option} \ |
| 118 |
-Dcatalina.home='${_tomcat_catalina_home}' \ |
135 |
-Dcatalina.home='${_tomcat_catalina_home}' \ |
| 119 |
-Dcatalina.base='${_tomcat_catalina_base}' \ |
136 |
-Dcatalina.base='${_tomcat_catalina_base}' \ |
| 120 |
-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ |
137 |
-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ |