diff -u tomcat6-6.0.18/debian/changelog tomcat6-6.0.18/debian/changelog --- tomcat6-6.0.18/debian/changelog +++ tomcat6-6.0.18/debian/changelog @@ -1,3 +1,12 @@ +tomcat6 (6.0.18-0ubuntu3) intrepid; urgency=low + + * debian/tomcat6.postinst: + - Make /var/lib/tomcat6/temp writeable by the tomcat6 user (LP: #287126) + - Make /var/lib/tomcat6/webapps writeable by tomcat6 group (LP: #287447) + * debian/tomcat6.init: make status return nonzero if tomcat6 is not running + + -- Thierry Carrez Thu, 23 Oct 2008 18:02:07 +0200 + tomcat6 (6.0.18-0ubuntu2) intrepid; urgency=low * debian/rules: call dh_installinit with --error-handler so that install diff -u tomcat6-6.0.18/debian/tomcat6.postinst tomcat6-6.0.18/debian/tomcat6.postinst --- tomcat6-6.0.18/debian/tomcat6.postinst +++ tomcat6-6.0.18/debian/tomcat6.postinst @@ -11,6 +11,9 @@ chmod 750 /var/log/tomcat6 /var/cache/tomcat6 chgrp tomcat6 /etc/tomcat6/tomcat-users.xml chmod 640 /etc/tomcat6/tomcat-users.xml + chown tomcat6 /var/lib/tomcat6/temp + chgrp tomcat6 /var/lib/tomcat6/webapps + chmod 775 /var/lib/tomcat6/webapps ;; esac diff -u tomcat6-6.0.18/debian/tomcat6.init tomcat6-6.0.18/debian/tomcat6.init --- tomcat6-6.0.18/debian/tomcat6.init +++ tomcat6-6.0.18/debian/tomcat6.init @@ -184,8 +184,10 @@ if [ -f "$CATALINA_PID" ]; then log_success_msg "$DESC is not running, but pid file exists." + exit 1 else log_success_msg "$DESC is not running." + exit 3 fi else log_success_msg "$DESC is running with pid `cat $CATALINA_PID`"