| @@ -1,16 +1,16 @@ | | | @@ -1,16 +1,16 @@ |
| 1 | #! @RCD_SCRIPTS_SHELL@ | | 1 | #! @RCD_SCRIPTS_SHELL@ |
| 2 | # | | 2 | # |
| 3 | # $NetBSD: tomcat.sh,v 1.2 2009/08/12 20:07:57 adrianp Exp $ | | 3 | # $NetBSD: tomcat.sh,v 1.3 2009/08/12 21:51:49 adrianp Exp $ |
| 4 | # | | 4 | # |
| 5 | # PROVIDE: tomcat | | 5 | # PROVIDE: tomcat |
| 6 | # REQUIRE: DAEMON | | 6 | # REQUIRE: DAEMON |
| 7 | # | | 7 | # |
| 8 | | | 8 | |
| 9 | if [ -r /etc/rc.subr ] | | 9 | if [ -r /etc/rc.subr ] |
| 10 | then | | 10 | then |
| 11 | . /etc/rc.subr | | 11 | . /etc/rc.subr |
| 12 | fi | | 12 | fi |
| 13 | | | 13 | |
| 14 | name="tomcat" | | 14 | name="tomcat" |
| 15 | rcvar=$name | | 15 | rcvar=$name |
| 16 | command="@TOMCAT_HOME@/bin/catalina.sh" | | 16 | command="@TOMCAT_HOME@/bin/catalina.sh" |
| @@ -54,26 +54,34 @@ tomcat_precmd() | | | @@ -54,26 +54,34 @@ tomcat_precmd() |
| 54 | if [ ! -d @VARBASE@/run/tomcat ]; then | | 54 | if [ ! -d @VARBASE@/run/tomcat ]; then |
| 55 | @MKDIR@ @VARBASE@/run/tomcat | | 55 | @MKDIR@ @VARBASE@/run/tomcat |
| 56 | @CHMOD@ 0750 @VARBASE@/run/tomcat | | 56 | @CHMOD@ 0750 @VARBASE@/run/tomcat |
| 57 | @CHOWN@ ${tomcat_user}:${tomcat_group} @VARBASE@/run/tomcat | | 57 | @CHOWN@ ${tomcat_user}:${tomcat_group} @VARBASE@/run/tomcat |
| 58 | fi | | 58 | fi |
| 59 | } | | 59 | } |
| 60 | | | 60 | |
| 61 | tomcat_start() | | 61 | tomcat_start() |
| 62 | { | | 62 | { |
| 63 | cd $CATALINA_HOME/logs | | 63 | cd $CATALINA_HOME/logs |
| 64 | @SU@ ${tomcat_user} -c "${command} start" | | 64 | @SU@ ${tomcat_user} -c "${command} start" |
| 65 | } | | 65 | } |
| 66 | | | 66 | |
| | | 67 | tomcat_stop() |
| | | 68 | { |
| | | 69 | rc_pid=$(check_pidfile $pidfile "java") |
| | | 70 | @SU@ ${tomcat_user} -c "${command} stop" |
| | | 71 | wait_for_pids $rc_pid |
| | | 72 | } |
| | | 73 | |
| | | 74 | |
| 67 | tomcat_run() | | 75 | tomcat_run() |
| 68 | { | | 76 | { |
| 69 | cd ${CATALINA_HOME}/logs | | 77 | cd ${CATALINA_HOME}/logs |
| 70 | @SU@ ${tomcat_user} -c "${command} run" | | 78 | @SU@ ${tomcat_user} -c "${command} run" |
| 71 | } | | 79 | } |
| 72 | | | 80 | |
| 73 | tomcat_version() | | 81 | tomcat_version() |
| 74 | { | | 82 | { |
| 75 | @SU@ ${tomcat_user} -c "${command} version" | | 83 | @SU@ ${tomcat_user} -c "${command} version" |
| 76 | } | | 84 | } |
| 77 | | | 85 | |
| 78 | tomcat_debug() | | 86 | tomcat_debug() |
| 79 | { | | 87 | { |