[tomcat6] WIP commit

[Dave Knox]

commit 5415ac44396e8195b6895d74a96ae3e63db1f226
Author: David Knox <dknox at dknox-laptop.(none)>
Date:   Thu Mar 15 16:16:11 2012 -0600

    WIP commit

 tomcat6-6.0.init |    8 ++++----
 tomcat6.spec     |   14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index dc8a51c..8cb2bb9 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -120,7 +120,7 @@ function makeHomeDir() {
         cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
         ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
         ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
-        chown root:${TOMCAT_USER} /var/log/${NAME}
+        chown ${TOMCAT_USER}:root /var/log/${NAME}
     fi
 }
 
@@ -165,11 +165,11 @@ function start() {
     export CATALINA_PID="/var/run/${NAME}.pid"
     touch $CATALINA_PID 2>&1 || RETVAL="4"
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then 
-      chown root:${TOMCAT_USER} $CATALINA_PID
+      chown ${TOMCAT_USER}:root $CATALINA_PID
     fi
     [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" 
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
-      chown root:${TOMCAT_USER} $TOMCAT_LOG
+      chown ${TOMCAT_USER}:root $TOMCAT_LOG
     fi
     if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then
         # Create a tomcat directory if it doesn't exist
@@ -187,7 +187,7 @@ function start() {
             >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"
     else
        
-       [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> /var/log/${NAME}/${TOMCAT_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
diff --git a/tomcat6.spec b/tomcat6.spec
index 36fa04a..2ca5d43 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -302,6 +302,8 @@ zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
+%{__install} -m 755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
+%{__install} -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
 
 # move things into place
 # First copy supporting libs to tomcat lib
@@ -338,8 +340,8 @@ popd
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
     > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
-%{__install} -m 755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
-%{__install} -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
+#%{__install} -m 755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
+#%{__install} -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
 # create jsp and servlet API symlinks
 pushd ${RPM_BUILD_ROOT}%{_javadir}
    %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
@@ -446,9 +448,9 @@ done
 
 %post
 # install but don't activate
-/sbin/chkconfig --add %{name}
 if [ $1 -eq 1 ]; then
 	#initial installation
+   /sbin/chkconfig --add %{name}
 	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
@@ -501,9 +503,9 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun
-/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 if [ $1 -ge 1 ]; then
 	#package upgrade, not uninstall
+	/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 	/bin/systemctl try-restart tomcat6.service > /dev/null 2>&1 || :
 fi
 
@@ -560,7 +562,7 @@ fi
 %attr(0775,root,tomcat) %dir %{tempdir}
 %attr(0775,root,tomcat) %dir %{workdir}
 %attr(0775,root,tomcat) %dir %{logdir}
-%attr(0664,root,tomcat) %{logdir}/catalina.out
+%attr(0664,tomcat,root) %{logdir}/catalina.out
 %dir %{homedir}
 %{bindir}/bootstrap.jar
 %{bindir}/catalina-tasks.xml
@@ -632,7 +634,7 @@ fi
 * Mon Jan 19 2012 david Knox <dknox at redhat.com> 0:6.0.32-21
 - Resolves: rhbz 701038 user shell changed to sbin versus bin 
 - Resolves: rhbz 781675 ownership for catalina.out changed from 
-- tomcat:tomcat to root:tomcat
+- tomcat:tomcat to tomcat:root
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:6.0.32-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild