Author: mkoch Date: 2007-09-02 06:07:28 +0000 (Sun, 02 Sep 2007) New Revision: 4086
Added: trunk/tomcat5.5/debian/tomcat5.5.preinst Modified: trunk/tomcat5.5/debian/NEWS trunk/tomcat5.5/debian/README.Debian trunk/tomcat5.5/debian/changelog trunk/tomcat5.5/debian/control trunk/tomcat5.5/debian/tomcat5.5-admin.dirs trunk/tomcat5.5/debian/tomcat5.5-admin.install trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst trunk/tomcat5.5/debian/tomcat5.5.dirs trunk/tomcat5.5/debian/tomcat5.5.install trunk/tomcat5.5/debian/tomcat5.5.links trunk/tomcat5.5/debian/tomcat5.5.postinst trunk/tomcat5.5/debian/tomcat5.5.postrm Log: * Applied patch from David Pashley to move configuration from /var/lib/tomcat5.5/conf to /etc/tomcat5.5 (Closes: #434728). Modified: trunk/tomcat5.5/debian/NEWS =================================================================== --- trunk/tomcat5.5/debian/NEWS 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/NEWS 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,6 +1,15 @@ +tomcat5.5 (5.5.20-6) unstable; urgency=low + + * Configuration has moved from /var/lib/tomcat5.5/conf to /etc/tomcat5.5. + The maintainer scripts will attempt to migrate any config files to the + correct location in /etc/tomcat5.5, but a backup will be left in + /var/lib/tomcat5.5/conf.backup + + -- David Pashley <[EMAIL PROTECTED]> Wed, 25 Jul 2007 14:09:08 +0100 + tomcat5.5 (5.5.17-2) unstable; urgency=low - Tomcat5.5 has a new user: tomcat55. + * Tomcat5.5 has a new user: tomcat55. -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 9 Oct 2006 16:03:21 +0200 Modified: trunk/tomcat5.5/debian/README.Debian =================================================================== --- trunk/tomcat5.5/debian/README.Debian 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/README.Debian 2007-09-02 06:07:28 UTC (rev 4086) @@ -58,7 +58,7 @@ - There is a webapp for basic web-based administration of Tomcat's webapps in the tomcat5.5-admin package. You need to add one of the users in - /var/lib/tomcat5.5/conf/tomcat-users.xml to the manager role and probably + /etc/tomcat5.5/tomcat-users.xml to the manager role and probably set a better password. The "Web Application Manager" can then be accessed at http://localhost:8180/manager/html. There's also a more sophisticated administration webapp called "admin" in the same package but it can't make Modified: trunk/tomcat5.5/debian/changelog =================================================================== --- trunk/tomcat5.5/debian/changelog 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/changelog 2007-09-02 06:07:28 UTC (rev 4086) @@ -21,8 +21,10 @@ (Closes: #425020). * Make cron.daily script work when package is removed but not purged (Closes: #436020). + * Applied patch from David Pashley to move configuration from + /var/lib/tomcat5.5/conf to /etc/tomcat5.5 (Closes: #434728). - -- Michael Koch <[EMAIL PROTECTED]> Sat, 11 Aug 2007 22:46:11 +0200 + -- Michael Koch <[EMAIL PROTECTED]> Sun, 02 Sep 2007 00:35:12 +0200 tomcat5.5 (5.5.20-5) unstable; urgency=low Modified: trunk/tomcat5.5/debian/control =================================================================== --- trunk/tomcat5.5/debian/control 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/control 2007-09-02 06:07:28 UTC (rev 4086) @@ -13,6 +13,7 @@ Architecture: all Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), ecj-bootstrap, jsvc (>= 1.0.2~svn20061127-6) Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${source:Version}), tomcat5.5-admin (>= ${source:Version}) +Conflicts: tomcat5.5-admin (<= 5.5.20-5) Description: Servlet and JSP engine Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages technologies. Modified: trunk/tomcat5.5/debian/tomcat5.5-admin.dirs =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5-admin.dirs 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5-admin.dirs 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,3 +1,3 @@ etc/tomcat5.5/policy.d -var/lib/tomcat5.5/conf/Catalina/localhost +etc/tomcat5.5/Catalina/localhost usr/share/tomcat5.5/server Modified: trunk/tomcat5.5/debian/tomcat5.5-admin.install =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5-admin.install 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5-admin.install 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,2 +1,2 @@ -debian/context/admin/*.xml /var/lib/tomcat5.5/conf/Catalina/localhost/ +debian/context/admin/*.xml /etc/tomcat5.5/Catalina/localhost/ build/dist/server/webapps /usr/share/tomcat5.5/server Modified: trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst 2007-09-02 06:07:28 UTC (rev 4086) @@ -8,7 +8,7 @@ # New installation, not a package upgrade # create context links for context in /usr/share/tomcat5.5-webapps/*.xml; do - ln -sf $context /var/lib/tomcat5.5/conf/Catalina/localhost/ + ln -sf $context /etc/tomcat5.5/Catalina/localhost/ done if [ -x /etc/init.d/tomcat5.5 ]; then Modified: trunk/tomcat5.5/debian/tomcat5.5.dirs =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.dirs 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5.dirs 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,8 +1,8 @@ etc/default etc/tomcat5.5/policy.d +etc/tomcat5.5/Catalina/localhost usr/share/tomcat5.5 var/cache/tomcat5.5 -var/lib/tomcat5.5/conf/Catalina/localhost var/lib/tomcat5.5/shared/classes var/lib/tomcat5.5/shared/lib var/lib/tomcat5.5/temp Modified: trunk/tomcat5.5/debian/tomcat5.5.install =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.install 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5.install 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,6 +1,11 @@ build/dist/bin /usr/share/tomcat5.5 -build/dist/conf /var/lib/tomcat5.5 -build/dist/conf/tomcat-users.xml /usr/share/tomcat5.5/.debian/ -build/dist/conf/web.xml /etc/tomcat5.5/ +build/dist/conf/server.xml /etc/tomcat5.5/ +build/dist/conf/logging.properties /etc/tomcat5.5/ +build/dist/conf/catalina.properties /etc/tomcat5.5/ +build/dist/conf/server-minimal.xml /etc/tomcat5.5/ +build/dist/conf/catalina.policy /etc/tomcat5.5/ +build/dist/conf/tomcat-users.xml /etc/tomcat5.5/ +build/dist/conf/context.xml /etc/tomcat5.5/ +build/dist/conf/web.xml /etc/tomcat5.5/ debian/policy/* /etc/tomcat5.5/policy.d/ debian/server.xml /etc/tomcat5.5/ Modified: trunk/tomcat5.5/debian/tomcat5.5.links =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.links 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5.links 2007-09-02 06:07:28 UTC (rev 4086) @@ -1,4 +1,5 @@ -/var/lib/tomcat5.5/conf /usr/share/tomcat5.5/conf +/etc/tomcat5.5 /usr/share/tomcat5.5/conf +/etc/tomcat5.5 /var/lib/tomcat5.5/conf /usr/share/doc/tomcat5.5 /usr/share/tomcat5.5/doc /var/lib/tomcat5.5/logs /usr/share/tomcat5.5/logs /var/lib/tomcat5.5/work /usr/share/tomcat5.5/work @@ -6,7 +7,5 @@ /var/lib/tomcat5.5/temp /usr/share/tomcat5.5/temp /var/lib/tomcat5.5/webapps /usr/share/tomcat5.5/webapps /var/log/tomcat5.5 /var/lib/tomcat5.5/logs -/etc/tomcat5.5/server.xml /var/lib/tomcat5.5/conf/server.xml -/etc/tomcat5.5/web.xml /var/lib/tomcat5.5/conf/web.xml /var/cache/tomcat5.5 /var/lib/tomcat5.5/work /usr/share/java/mx4j.jar /usr/share/tomcat5.5/bin/jmx.jar Modified: trunk/tomcat5.5/debian/tomcat5.5.postinst =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.postinst 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5.postinst 2007-09-02 06:07:28 UTC (rev 4086) @@ -8,21 +8,12 @@ tomcat55 fi chown -R tomcat55:nogroup /var/log/tomcat5.5 /var/cache/tomcat5.5 - chown -R tomcat55:adm /var/lib/tomcat5.5/conf + chown -R tomcat55:adm /etc/tomcat5.5 chown tomcat55:adm /var/log/tomcat5.5 /var/cache/tomcat5.5 - chmod -R 770 /var/lib/tomcat5.5/conf - chmod 750 /var/log/tomcat5.5 /var/lib/tomcat5.5/conf + chmod -R 770 /etc/tomcat5.5 + chmod 750 /var/log/tomcat5.5 /etc/tomcat5.5 chmod 700 /var/cache/tomcat5.5 - if [ ! -f /var/lib/tomcat5.5/conf/tomcat-users.xml ]; then - echo "Installing /var/lib/tomcat5.5/conf/tomcat-users.xml." - install -o tomcat55 -g adm -m 600 \ - /usr/share/tomcat5.5/.debian/tomcat-users.xml \ - /var/lib/tomcat5.5/conf/ - fi - if [ -f /etc/tomcat5.5/tomcat-users.xml ]; then - mv /etc/tomcat5.5/tomcat-users.xml \ - /etc/tomcat5.5/tomcat-users.xml.dpkg-old || true - fi + ln -sf /etc/tomcat5.5 /var/lib/tomcat5.5/conf ;; esac Modified: trunk/tomcat5.5/debian/tomcat5.5.postrm =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.postrm 2007-09-01 18:28:17 UTC (rev 4085) +++ trunk/tomcat5.5/debian/tomcat5.5.postrm 2007-09-02 06:07:28 UTC (rev 4086) @@ -3,7 +3,7 @@ #DEBHELPER# # Remove cached files and auto-generated catalina.policy -rm -rf /var/cache/tomcat5.5/* /var/lib/tomcat5.5/conf/catalina.policy +rm -rf /var/cache/tomcat5.5/* /etc/tomcat5.5/catalina.policy case "$1" in purge) @@ -11,7 +11,7 @@ # /var/lib/tomcat5.5 because there might be user-installed webapps) userdel tomcat55 || true rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 \ - /var/lib/tomcat5.5/conf /var/lib/tomcat5.5/temp + /var/lib/tomcat5.5/temp rmdir --ignore-fail-on-non-empty /var/lib/tomcat5.5 || true rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5 || true # remove user tomcat5 if it exists, and package tomcat5 is Added: trunk/tomcat5.5/debian/tomcat5.5.preinst =================================================================== --- trunk/tomcat5.5/debian/tomcat5.5.preinst (rev 0) +++ trunk/tomcat5.5/debian/tomcat5.5.preinst 2007-09-02 06:07:28 UTC (rev 4086) @@ -0,0 +1,22 @@ +#!/bin/sh + +case "$1" in + upgrade) + + # Migrate any user config from /var/lib/tomcat5.5/conf to + # /etc/tomcat5.5 if the former isn't a symlink yet. + # Affects > 5.5.20-5 + if [ -e /var/lib/tomcat5.5/conf -a ! -L /var/lib/tomcat5.5/conf ]; then + cp -a /var/lib/tomcat5.5/conf /var/lib/tomcat5.5/conf.backup + for dir in $(find /var/lib/tomcat5.5/conf/ -type d); do + mkdir -p $(echo $dir | sed -e's@/var/lib/tomcat5.5/conf/@/etc/tomcat5.5/@') + done + for file in $(find /var/lib/tomcat5.5/conf/ -type f); do + mv $file $(echo $file | sed -e's@/var/lib/tomcat5.5/conf/@/etc/tomcat5.5/@') + done + rm -rf /var/lib/tomcat5.5/conf + fi + ;; +esac + +#DEBHELPER# _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
