[tomcat: 58/66] rhbz 693292:manager app doesn't work (directory permissions); rhbz 677414: incorrect directory permi

[Ivan Afonichev]

commit 74a4175fca98889952b7b10aa3af939ec92a1946
Author: David Knox <dknox at dknox.(none)>
Date:   Wed Apr 13 13:15:12 2011 -0600

    rhbz 693292:manager app doesn't work (directory permissions); rhbz 677414: incorrect directory permissions; Init scripts log to /initd.log versus catalina.out

 tomcat6-6.0.init |    6 +++---
 tomcat6.spec     |   45 +++++++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 919ddd1..ad81343 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -184,10 +184,10 @@ function start() {
     parseOptions
     if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then
         $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
-            >> $TOMCAT_LOG 2>&1 || RETVAL="4"
+            >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
     else
        
-       [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 || RETVAL="4"
+       [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> /var/log/${NAME}/initd.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" >> $TOMCAT_LOG 2>&1 || RETVAL="4"
+         [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
       fi
       if [ "$RETVAL" -eq "0" ]; then
          count="0"
diff --git a/tomcat6.spec b/tomcat6.spec
index a9ce551..da3c337 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -480,7 +480,7 @@ if [ "$1" = "0" ]; then
 fi
 
 %files
-%defattr(-,root,tomcat,0775)
+%defattr(0664,root,tomcat,0775)
 %doc {LICENSE,NOTICE,RELEASE*}
 %attr(0755,root,root) %{_bindir}/%{name}-digest
 %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
@@ -490,22 +490,22 @@ fi
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %attr(0765,root,tomcat) %dir %{basedir}
-%attr(0775,tomcat,root) %dir %{appdir}
-%attr(0775,tomcat,root) %dir %{confdir}
-%attr(0775,tomcat,root) %dir %{confdir}/Catalina
-%attr(0775,tomcat,root) %dir %{confdir}/Catalina/localhost
-%config(noreplace) %{confdir}/%{name}.conf
-%config(noreplace) %{confdir}/*.policy
-%config(noreplace) %{confdir}/*.properties
-%config(noreplace) %{confdir}/context.xml
-%config(noreplace) %{confdir}/server.xml
-%config(noreplace) %{confdir}/log4j.properties
-%attr(0664,tomcat,root) %config(noreplace) %{confdir}/tomcat-users.xml
-%config(noreplace) %{confdir}/web.xml
-%attr(0765,tomcat,root) %dir %{cachedir}
-%attr(0765,tomcat,root) %dir %{tempdir}
-%attr(0765,tomcat,root) %dir %{workdir}
-%attr(0775,tomcat,root) %dir %{logdir}
+%attr(0775,root,tomcat) %dir %{appdir}
+%attr(0775,root,tomcat) %dir %{confdir}
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0666,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
+%attr(0775,root,tomcat) %dir %{cachedir}
+%attr(0775,root,tomcat) %dir %{tempdir}
+%attr(0775,root,tomcat) %dir %{workdir}
+%attr(0775,root,tomcat) %dir %{logdir}
 %attr(0664,tomcat,tomcat) %{logdir}/catalina.out
 %dir %{homedir}
 %{bindir}/bootstrap.jar
@@ -523,7 +523,7 @@ fi
 %exclude %{_mavenpomdir}/*api*
 
 %files admin-webapps
-%defattr(-,root,root,-)
+%defattr(0664,root,tomcat,0775)
 %{appdir}/host-manager
 %{appdir}/manager
 
@@ -560,12 +560,17 @@ fi
 %{_mavenpomdir}/JPP-%{name}-el-api.pom
 
 %files webapps
-%defattr(-,root,tomcat,-)
+%defattr(0664,root,tomcat,0775)
 %{appdir}/ROOT
 %{appdir}/examples
 %{appdir}/sample
 
 %changelog
+* Wed Apr 13 2011 David Knox <dknox at redhat.com> 0:6.0.32-7
+- Resolve: rhbz 693292 - manager app doesn't work (directory permissions)
+- Resolve: rhbz 677414 - incorrect directory permissions
+- Init scripts log to $logdir/initd.log versus catalina.out
+
 * Fri Mar 04 2011 David Knox <dknox at redhat.com> 0:6.0.32-6
 - In useradd, set tomcat user shell to /sbin/nologin