[pkg-java] r11548 - trunk/tomcat6/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-02-10 23:29:18 +0000 (Wed, 10 Feb 2010)
New Revision: 11548

Modified:
   trunk/tomcat6/debian/README.Debian
   trunk/tomcat6/debian/control
Log:
* Add doc to clarify the role of each package

Modified: trunk/tomcat6/debian/README.Debian
===================================================================
--- trunk/tomcat6/debian/README.Debian	2010-02-10 22:15:41 UTC (rev 11547)
+++ trunk/tomcat6/debian/README.Debian	2010-02-10 23:29:18 UTC (rev 11548)
@@ -1,16 +1,21 @@
 Getting started:
-  * The server should be accessible at http://localhost:8080/ once installed.
-  * If you install tomcat6-admin, then Tomcat administration will be accessible
-    on http://localhost:8080/manager/, the default username is tomcat and 
-    the password is also tomcat.
+  * After installing the tomcat6 package, the server should be accessible
+    at http://localhost:8080/
+  * If you install tomcat6-admin, then you need to edit 
+    /etc/tomcat6/tomcat6-users.xml and add to it the following:
+      <role rolename="manager"/>
+      <user username="tomcat" password="s3cret" roles="manager"/>
+    Tomcat administration will be accessible on http://localhost:8080/manager/
   * Tomcat is NOT secured by default. Before exposing your Tomcat instance to
-    the internet, please change at least the passwords in 
+    the internet, please change the passwords in 
     /etc/tomcat6/tomcat-users.xml and turn on Java security: edit your 
     /etc/default/tomcat6 file and set TOMCAT6_SECURITY="yes".
     After you may need to change the policy files in /etc/tomcat6/policy.d/
     if the application doesn't start or produces new Exceptions. 
   * To run more than one Tomcat instance on your server, install the package
     tomcat6-user and run the tomcat6-instance-create utility.
+    You should remove the tomcat6 package if you don't want Tomcat to
+    start as a daemon at boot time.
   * If you configure your Tomcat to listen on one
     or more privileged ports (such as port 80 or port 443), then you
     may now enable authbind in your /etc/default/tomcat6 file.  The

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2010-02-10 22:15:41 UTC (rev 11547)
+++ trunk/tomcat6/debian/control	2010-02-10 23:29:18 UTC (rev 11548)
@@ -6,7 +6,7 @@
  Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: default-jdk, ant-optional, debhelper (>= 7)
-Build-Depends-Indep: maven-repo-helper, libecj-java
+Build-Depends-Indep: maven-repo-helper (>= 1.0.1), libecj-java
 Standards-Version: 3.8.4
 Homepage: http://tomcat.apache.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6/
@@ -30,26 +30,35 @@
 Recommends: authbind
 Suggests: tomcat6-docs (>= ${source:Version}),
 	tomcat6-admin (>= ${source:Version}),
-	tomcat6-examples (>= ${source:Version})
+	tomcat6-examples (>= ${source:Version}),
+	tomcat6-user (>= ${source:Version})
 Description: Servlet and JSP engine
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
  server environment for Java code to run.
  .
- This package just contains the startup scripts for the system-wide daemon.
+ This package contains only the startup scripts for the system-wide daemon.
  No documentation or web applications are included here, please install
  the tomcat6-docs and tomcat6-examples packages if you want them.
  Install the authbind package if you need to use Tomcat on ports 1-1023.
+ Install tomcat6-user instead of this package if you don't want Tomcat to
+ start as a service.
 
 Package: tomcat6-user
 Architecture: all
 Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
+Suggests: tomcat6-docs (>= ${source:Version}),
+	tomcat6-admin (>= ${source:Version}),
+	tomcat6-examples (>= ${source:Version}),
+	tomcat6 (>= ${source:Version})
 Description: Servlet and JSP engine -- tools to create user instances
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
  server environment for Java code to run.
  .
  This package contains files needed to create a user Tomcat instance.
+ This user Tomcat instance can be started and stopped using the scripts
+ provided in the Tomcat instance directory.
 
 Package: libtomcat6-java
 Architecture: all