Attachment 702485 Details for Bug 915447 – Patch

[patch] Patch

915447.patch (text/plain), 1.76 KB, created by Etienne Carrière on 2013-02-25 18:59:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etienne Carrière

Created: 2013-02-25 18:59:35 UTC

Size: 1.76 KB

patch

obsolete

>--- tomcat6.rhel6	2013-02-25 19:45:19.738504418 +0100
>+++ tomcat6.915447	2013-02-25 19:57:56.186896750 +0100
>@@ -66,6 +66,9 @@
> # Define the tomcat username
> TOMCAT_USER="${TOMCAT_USER:-tomcat}"
> 
>+# Define the tomcat group
>+TOMCAT_GROUP="${TOMCAT_GROUP:-$TOMCAT_USER}"
>+
> # Define the tomcat log file
> TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}"
> 
>@@ -166,11 +169,11 @@
>     export CATALINA_PID="/var/run/${NAME}.pid"
>     touch $CATALINA_PID 2>&1 || RETVAL="4"
>     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then 
>-      chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
>+      chown ${TOMCAT_USER}:${TOMCAT_GROUP} $CATALINA_PID
>     fi
>     [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" 
>     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
>-      chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
>+      chown ${TOMCAT_USER}:${TOMCAT_GROUP} $TOMCAT_LOG
>     fi
>     if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then
>         # Create a tomcat directory if it doesn't exist
>@@ -255,7 +258,7 @@
>       if [ "$RETVAL" -eq "2" ]; then
>          log_failure_msg "${NAME} lockfile exists but process is not running"
>       else
>-         pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
>+         pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_GROUP} java)"
>          if [ -z "$pid" ]; then
>              log_success_msg "${NAME} is stopped"
>              RETVAL="3"
>@@ -270,7 +273,7 @@
> function checklockfile()
> {
>    if [ -f /var/lock/subsys/${NAME} ]; then
>-      pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
>+      pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_GROUP} java)"
> # The lockfile exists but the process is not running
>       if [ -z "$pid" ]; then
>          RETVAL="2"

Actions: View | Diff

Attachments on bug 915447: 702485