Attachment 892741 Details for Bug 1094545 – /etc/init.d/tomcat patch to create CATALINA_BASE rather than CATALINA_HOME

[patch] /etc/init.d/tomcat patch to create CATALINA_BASE rather than CATALINA_HOME

tomcat-initfix.patch (text/plain), 3.96 KB, created by Richard Davies on 2014-05-06 00:31:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Davies

Created: 2014-05-06 00:31:25 UTC

Size: 3.96 KB

patch

obsolete

>--- /etc/init.d/tomcat	2014-04-30 22:17:23.000000000 +0100
>+++ /etc/init.d/tomcat-initfix	2014-05-06 02:29:16.508001884 +0100
>@@ -66,8 +66,11 @@
> # Define the tomcat username
> TOMCAT_USER="${TOMCAT_USER:-tomcat}"
> 
>+# Define the tomcat group name
>+TOMCAT_GROUP="${TOMCAT_GROUP:-tomcat}"
>+
> # Define the tomcat log file
>-TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}"
>+TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_BASE}/logs/${NAME}-initd.log}"
> 
> 
> RETVAL="0"
>@@ -105,22 +108,23 @@
> }
> 
> function makeHomeDir() {
>-    if [ ! -d "$CATALINA_HOME" ]; then
>-        echo "$CATALINA_HOME does not exist, creating"
>-        if [ ! -d "/usr/share/${NAME}" ]; then
>-            mkdir /usr/share/${NAME}
>-            cp -pLR /usr/share/tomcat/* /usr/share/${NAME}
>-        fi
>+    if [ ! -d "$CATALINA_BASE" ]; then
>+        echo "CATALINA_BASE $CATALINA_BASE does not exist, creating"
>         mkdir -p /var/log/${NAME} \
>                  /var/cache/${NAME} \
>-                 /var/tmp/${NAME}
>-        ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work
>-        ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
>-        cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
>-        cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
>-        ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib
>-        ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps
>-        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
>+                 /var/tmp/${NAME} \
>+                 $CATALINA_BASE
>+        ln -fs /var/cache/${NAME} ${CATALINA_BASE}/work
>+        ln -fs /var/tmp/${NAME} ${CATALINA_BASE}/temp
>+        cp -pLR ${CATALINA_HOME}/bin $CATALINA_BASE
>+        cp -pLR ${CATALINA_HOME}/conf $CATALINA_BASE
>+        ln -fs /usr/share/java/tomcat ${CATALINA_BASE}/lib
>+        ln -fs /usr/share/tomcat/webapps ${CATALINA_BASE}/webapps
>+        ln -fs /var/log/${NAME} ${CATALINA_BASE}/logs
>+        chown ${TOMCAT_USER}:${TOMCAT_GROUP} /var/log/${NAME}
>+        chown ${TOMCAT_USER}:${TOMCAT_GROUP} /var/cache/${NAME}
>+        chown ${TOMCAT_USER}:${TOMCAT_GROUP} /var/tmp/${NAME}
>+        chown ${TOMCAT_USER}:${TOMCAT_GROUP} $CATALINA_BASE
>     fi
> }
> 
>@@ -161,27 +165,31 @@
>             fi
>         fi
>     fi
>-    # fix permissions on the log and pid files
>     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
>-    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
>+    parseOptions
>+    if [ ! -d "$CATALINA_HOME" ]; then
>+        echo "CATALINA_HOME $CATALINA_HOME does not exist, exiting"
>+        exit 1
>     fi
>-    if [ "$CATALINA_HOME" != "/usr/share/tomcat" -a "$RETVAL" -eq "0" ]; then
>+    if [ ! -d "$CATALINA_BASE" ]; then
>         # Create a tomcat directory if it doesn't exist
>         makeHomeDir
>-        # If CATALINA_HOME doesn't exist modify port number so that
>+        # If CATALINA_BASE doesn't exist modify port number so that
>         # multiple instances don't interfere with each other
>         findFreePorts
>         sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \
>             -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \
>-            ${CATALINA_HOME}/conf/server.xml
>+            ${CATALINA_BASE}/conf/server.xml
>+    fi
>+    # fix permissions on the log and pid files
>+    touch $CATALINA_PID 2>&1 || RETVAL="4"
>+    if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
>+      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_GROUP} $TOMCAT_LOG
>     fi
>-    parseOptions
>     if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then
>         $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
>             >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"

Actions: View | Diff

Attachments on bug 1094545: 892741