Your message dated Fri, 07 Sep 2007 21:02:17 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#434728: fixed in tomcat5.5 5.5.23-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: tomcat5.5
Version: 5.5.20-5
Severity: serious
Tags: patch
Justification: Policy 10.7.2
All the config files should be in /etc/tomcat5.5. The current scheme
where some files are in /etc/tomcat5.5 and some are in
/var/lib/tomcat5.5/conf with symlinks to the ones in /etc/tomcat5.5 is
just confusing. I've included a patch which should move the conf
directory to /etc/tomcat5.5 and hopefully migrate users files. It has
been tested, but not heavily.
-- System Information:
Debian Release: lenny/sid
APT prefers gutsy-updates
APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500,
'gutsy-backports'), (500, 'gutsy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22-8-generic (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/NEWS b/debian/NEWS
index 8e9d7af..27c9435 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,15 @@
+tomcat5.5 (5.5.20-6) dapper; 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
diff --git a/debian/README.Debian b/debian/README.Debian
index 4bd65bd..1085460 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -58,7 +58,7 @@ Apache Tomcat 5.5 for Debian
- 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
diff --git a/debian/control b/debian/control
index 7433d8d..cfedfc1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: tomcat5.5
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.
diff --git a/debian/tomcat5.5-admin.dirs b/debian/tomcat5.5-admin.dirs
index 3b3598a..5c7ada1 100644
--- a/debian/tomcat5.5-admin.dirs
+++ b/debian/tomcat5.5-admin.dirs
@@ -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
diff --git a/debian/tomcat5.5-admin.install b/debian/tomcat5.5-admin.install
index 3d73931..b3cf019 100644
--- a/debian/tomcat5.5-admin.install
+++ b/debian/tomcat5.5-admin.install
@@ -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
diff --git a/debian/tomcat5.5-webapps.postinst b/debian/tomcat5.5-webapps.postinst
index 59fb012..522aebe 100644
--- a/debian/tomcat5.5-webapps.postinst
+++ b/debian/tomcat5.5-webapps.postinst
@@ -8,7 +8,7 @@ case "$1" in
# 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
diff --git a/debian/tomcat5.5.dirs b/debian/tomcat5.5.dirs
index c74185d..8ccf3be 100644
--- a/debian/tomcat5.5.dirs
+++ b/debian/tomcat5.5.dirs
@@ -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
diff --git a/debian/tomcat5.5.install b/debian/tomcat5.5.install
index 8600e87..28bde42 100644
--- a/debian/tomcat5.5.install
+++ b/debian/tomcat5.5.install
@@ -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/
diff --git a/debian/tomcat5.5.links b/debian/tomcat5.5.links
index 3a656ec..45e31d6 100644
--- a/debian/tomcat5.5.links
+++ b/debian/tomcat5.5.links
@@ -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
diff --git a/debian/tomcat5.5.postinst b/debian/tomcat5.5.postinst
index f269ad2..8ab786f 100644
--- a/debian/tomcat5.5.postinst
+++ b/debian/tomcat5.5.postinst
@@ -8,21 +8,12 @@ case "$1" in
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
diff --git a/debian/tomcat5.5.postrm b/debian/tomcat5.5.postrm
index b9b2c86..0a0d791 100644
--- a/debian/tomcat5.5.postrm
+++ b/debian/tomcat5.5.postrm
@@ -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 @@ case "$1" in
# /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
diff --git a/debian/tomcat5.5.preinst b/debian/tomcat5.5.preinst
new file mode 100644
index 0000000..3034567
--- /dev/null
+++ b/debian/tomcat5.5.preinst
@@ -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#
--- End Message ---
--- Begin Message ---
Source: tomcat5.5
Source-Version: 5.5.23-1
We believe that the bug you reported is fixed in the latest version of
tomcat5.5, which is due to be installed in the Debian FTP archive:
libtomcat5.5-java_5.5.23-1_all.deb
to pool/main/t/tomcat5.5/libtomcat5.5-java_5.5.23-1_all.deb
tomcat5.5-admin_5.5.23-1_all.deb
to pool/main/t/tomcat5.5/tomcat5.5-admin_5.5.23-1_all.deb
tomcat5.5-webapps_5.5.23-1_all.deb
to pool/main/t/tomcat5.5/tomcat5.5-webapps_5.5.23-1_all.deb
tomcat5.5_5.5.23-1.diff.gz
to pool/main/t/tomcat5.5/tomcat5.5_5.5.23-1.diff.gz
tomcat5.5_5.5.23-1.dsc
to pool/main/t/tomcat5.5/tomcat5.5_5.5.23-1.dsc
tomcat5.5_5.5.23-1_all.deb
to pool/main/t/tomcat5.5/tomcat5.5_5.5.23-1_all.deb
tomcat5.5_5.5.23.orig.tar.gz
to pool/main/t/tomcat5.5/tomcat5.5_5.5.23.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Koch <[EMAIL PROTECTED]> (supplier of updated tomcat5.5 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 02 Sep 2007 11:28:05 +0200
Source: tomcat5.5
Binary: libtomcat5.5-java tomcat5.5 tomcat5.5-admin tomcat5.5-webapps
Architecture: source all
Version: 5.5.23-1
Distribution: unstable
Urgency: low
Maintainer: Michael Koch <[EMAIL PROTECTED]>
Changed-By: Michael Koch <[EMAIL PROTECTED]>
Description:
libtomcat5.5-java - Java Servlet engine -- core libraries
tomcat5.5 - Servlet and JSP engine
tomcat5.5-admin - Java Servlet engine -- admin & manager web interfaces
tomcat5.5-webapps - Java Servlet engine -- documentation and example web
applications
Closes: 396170 425020 426740 426761 427978 431704 434617 434728 436020
Changes:
tomcat5.5 (5.5.23-1) unstable; urgency=low
.
[ Marcus Better ]
* New upstream version.
* Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
#426761)
* Make sure files under /var/lib/tomcat5.5/conf are not
executable. Thanks to Marco Nenciarini. (Closes: #426740)
* Fixes a failure to start if the temp directory contained too many
files. Thanks to Maarten van der Hoef (Closes: #427978)
* tomcat5.5-admin now depends on libcommons-collections3-java and
libcommons-digester-java.
.
[ Michael Koch ]
* Clean up correctly on (re-)build (Closes: #434617).
* Replaced obsolete ${Source-Version} by ${source:Version}.
* Added myself to Uploaders.
* Updated (Build-)Depends on libcommons-modeler-java to (>= 2.0).
* Clear up comment in debian/tomcat5.5.default about TOMCAT55_USER.
(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).
* Use ${catalina.base} instead of ${catalina.home} in
debian/policy/50user.policy (Closes: #431704).
* Make tomcat5.5 depend on libecj-java instead of ecj-bootstrap
(Closes: #396170).
* Don't make tomcat5.5 on two non-virtual java runtimes. Removed kaffe.
* Don't let tomcat5.5 suggest libapache-mod-jk. Doesn't exist anymore.
* Fixed watch file.
* Set CATALINA_BASE to /var/lib/$NAME in debian/tomcat5.5.init.
Files:
a8daff8a528e0797d7a58bf8acdbe3de 1294 web optional tomcat5.5_5.5.23-1.dsc
362d1d8b15dc09882440dcab8c592dd7 4895919 web optional
tomcat5.5_5.5.23.orig.tar.gz
8eaad8b7718e0026f0216739eb3dd67c 27933 web optional tomcat5.5_5.5.23-1.diff.gz
f84c05d2e327990296906ec9c9716493 57570 web optional tomcat5.5_5.5.23-1_all.deb
d3783c4cb2d620889dcaa8f220569718 2374554 web optional
libtomcat5.5-java_5.5.23-1_all.deb
44665a749152230d968b32e54d08f9c5 1481332 web optional
tomcat5.5-webapps_5.5.23-1_all.deb
295f6ff37cc9b26824e790f1f9104f20 1102490 web optional
tomcat5.5-admin_5.5.23-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFG4cttWSOgCCdjSDsRAt0MAJ9gJnwFpp63ufbyEhlEeYbINlNmaQCgkxUN
O0s+SdHAU7/66I/Yp9TfQWM=
=Jyfu
-----END PGP SIGNATURE-----
--- End Message ---
