rpms/pki-servlet-engine
6
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
David Knox 2011-04-13 13:15:12 -06:00
parent 8ee466247f
commit 74a4175fca
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tomcat6-6.0.init
View File

@ -184,10 +184,10 @@ function start() {
parseOptions parseOptions
if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then
$SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
>> $TOMCAT_LOG 2>&1 || RETVAL="4" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
else 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 fi
if [ "$RETVAL" -eq "0" ]; then if [ "$RETVAL" -eq "0" ]; then
log_success_msg log_success_msg
@ -206,7 +206,7 @@ function stop() {
parseOptions parseOptions
if [ "$RETVAL" -eq "0" ]; then if [ "$RETVAL" -eq "0" ]; then
touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4" 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 fi
if [ "$RETVAL" -eq "0" ]; then if [ "$RETVAL" -eq "0" ]; then
count="0" count="0"

45
tomcat6.spec
View File

@ -53,7 +53,7 @@
Name: tomcat6 Name: tomcat6
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} 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 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons Group: Networking/Daemons
@ -480,7 +480,7 @@ if [ "$1" = "0" ]; then
fi fi
%files %files
%defattr(-,root,tomcat,0775) %defattr(0664,root,tomcat,0775)
%doc {LICENSE,NOTICE,RELEASE*} %doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
@ -490,22 +490,22 @@ fi
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0765,root,tomcat) %dir %{basedir} %attr(0765,root,tomcat) %dir %{basedir}
%attr(0775,tomcat,root) %dir %{appdir} %attr(0775,root,tomcat) %dir %{appdir}
%attr(0775,tomcat,root) %dir %{confdir} %attr(0775,root,tomcat) %dir %{confdir}
%attr(0775,tomcat,root) %dir %{confdir}/Catalina %attr(0775,root,tomcat) %dir %{confdir}/Catalina
%attr(0775,tomcat,root) %dir %{confdir}/Catalina/localhost %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
%config(noreplace) %{confdir}/%{name}.conf %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/*.policy %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy
%config(noreplace) %{confdir}/*.properties %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties
%config(noreplace) %{confdir}/context.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml
%config(noreplace) %{confdir}/server.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
%config(noreplace) %{confdir}/log4j.properties %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties
%attr(0664,tomcat,root) %config(noreplace) %{confdir}/tomcat-users.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml %attr(0666,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
%attr(0765,tomcat,root) %dir %{cachedir} %attr(0775,root,tomcat) %dir %{cachedir}
%attr(0765,tomcat,root) %dir %{tempdir} %attr(0775,root,tomcat) %dir %{tempdir}
%attr(0765,tomcat,root) %dir %{workdir} %attr(0775,root,tomcat) %dir %{workdir}
%attr(0775,tomcat,root) %dir %{logdir} %attr(0775,root,tomcat) %dir %{logdir}
%attr(0664,tomcat,tomcat) %{logdir}/catalina.out %attr(0664,tomcat,tomcat) %{logdir}/catalina.out
%dir %{homedir} %dir %{homedir}
%{bindir}/bootstrap.jar %{bindir}/bootstrap.jar
@ -523,7 +523,7 @@ fi
%exclude %{_mavenpomdir}/*api* %exclude %{_mavenpomdir}/*api*
%files admin-webapps %files admin-webapps
%defattr(-,root,root,-) %defattr(0664,root,tomcat,0775)
%{appdir}/host-manager %{appdir}/host-manager
%{appdir}/manager %{appdir}/manager
@ -560,12 +560,17 @@ fi
%{_mavenpomdir}/JPP-%{name}-el-api.pom %{_mavenpomdir}/JPP-%{name}-el-api.pom
%files webapps %files webapps
%defattr(-,root,tomcat,-) %defattr(0664,root,tomcat,0775)
%{appdir}/ROOT %{appdir}/ROOT
%{appdir}/examples %{appdir}/examples
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Wed Apr 13 2011 David Knox <dknox@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@redhat.com> 0:6.0.32-6 * Fri Mar 04 2011 David Knox <dknox@redhat.com> 0:6.0.32-6
- In useradd, set tomcat user shell to /sbin/nologin - In useradd, set tomcat user shell to /sbin/nologin