diff options
| author | Ivan Afonichev <ivan.afonichev@gmail.com> | 2011-11-11 01:48:56 +0400 |
|---|---|---|
| committer | Ivan Afonichev <ivan.afonichev@gmail.com> | 2011-11-11 01:48:56 +0400 |
| commit | ddfc98c4f445649a2886286492f0a5cc585b13a8 (patch) | |
| tree | c262b4c91558d53186134e76d266bf4a293184df /tomcat-7.0.init | |
| parent | 4b23f91d227c436208fa42df3f2222ed3fff12fb (diff) | |
| download | tomcat-ddfc98c4f445649a2886286492f0a5cc585b13a8.tar.gz tomcat-ddfc98c4f445649a2886286492f0a5cc585b13a8.tar.xz tomcat-ddfc98c4f445649a2886286492f0a5cc585b13a8.zip | |
+- Drop %%update_maven_depmap as in tomcat6
+- Provide native systemd unit file ported from tomcat6
Diffstat (limited to 'tomcat-7.0.init')
| -rw-r--r-- | tomcat-7.0.init | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tomcat-7.0.init b/tomcat-7.0.init index 7808d23..cddf8cd 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}" TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file -TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat/catalina.out}" +TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" RETVAL="0" @@ -184,10 +184,10 @@ function start() { parseOptions if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ - >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" + >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" else - [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" fi if [ "$RETVAL" -eq "0" ]; then log_success_msg @@ -206,7 +206,7 @@ function stop() { parseOptions if [ "$RETVAL" -eq "0" ]; then touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4" - [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4" fi if [ "$RETVAL" -eq "0" ]; then count="0" |