*** empty log message ***

2 files changed, 169 insertions, 3 deletions

diff --git a/net-www/tomcat/files/httpd.tomcat b/net-www/tomcat/files/httpd.tomcat
new file mode 100644
index 000000000000..cfba3843d7ec
--- /dev/null
+++ b/net-www/tomcat/files/httpd.tomcat
@@ -0,0 +1,166 @@
+###################################################################
+# Auto generated configuration. Dated: Tue Jul 10 03:54:01 CEST 2001
+###################################################################
+
+#
+# The following line instructs Apache to load the jk module
+#
+LoadModule jk_module /usr/lib/apache/mod_jk.so
+
+JkWorkersFile /opt/jakarta/tomcat/conf/workers.properties
+JkLogFile /var/log/apache/mod_jk.log
+
+#
+# Log level to be used by mod_jk
+#
+JkLogLevel error
+
+###################################################################
+#                     SSL configuration                           #
+# 
+# By default mod_jk is configured to collect SSL information from
+# the apache environment and send it to the Tomcat workers. The
+# problem is that there are many SSL solutions for Apache and as
+# a result the environment variable names may change.
+#
+# The following (commented out) JK related SSL configureation
+# can be used to customize mod_jk's SSL behaviour.
+# 
+# Should mod_jk send SSL information to Tomact (default is On)
+# JkExtractSSL Off
+# 
+# What is the indicator for SSL (default is HTTPS)
+# JkHTTPSIndicator HTTPS
+# 
+# What is the indicator for SSL session (default is SSL_SESSION_ID)
+# JkSESSIONIndicator SSL_SESSION_ID
+# 
+# What is the indicator for client SSL cipher suit (default is SSL_CIPHER)
+# JkCIPHERIndicator SSL_CIPHER
+# 
+# What is the indicator for the client SSL certificated (default is SSL_CLIENT_CERT)
+# JkCERTSIndicator SSL_CLIENT_CERT
+# 
+#                                                                 #
+###################################################################
+
+#
+# Root context mounts for Tomcat
+#
+JkMount /*.jsp ajp12
+JkMount /servlet/* ajp12
+
+#########################################################
+# Auto configuration for the /examples context starts.
+#########################################################
+
+#
+# The following line makes apache aware of the location of the /examples context
+#
+Alias /examples "/opt/jakarta/tomcat/webapps/examples"
+<Directory "/opt/jakarta/tomcat/webapps/examples">
+    Options Indexes FollowSymLinks
+</Directory>
+
+#
+# The following line mounts all JSP files and the /servlet/ uri to tomcat
+#
+JkMount /examples/servlet/* ajp12
+JkMount /examples/*.jsp ajp12
+
+#
+# The following line prohibits users from directly accessing WEB-INF
+#
+<Location "/examples/WEB-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#
+# The following line prohibits users from directly accessing META-INF
+#
+<Location "/examples/META-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#######################################################
+# Auto configuration for the /examples context ends.
+#######################################################
+
+#########################################################
+# Auto configuration for the /admin context starts.
+#########################################################
+
+#
+# The following line makes apache aware of the location of the /admin context
+#
+Alias /admin "/opt/jakarta/tomcat/webapps/admin"
+<Directory "/opt/jakarta/tomcat/webapps/admin">
+    Options Indexes FollowSymLinks
+</Directory>
+
+#
+# The following line mounts all JSP files and the /servlet/ uri to tomcat
+#
+JkMount /admin/servlet/* ajp12
+JkMount /admin/*.jsp ajp12
+
+#
+# The following line prohibits users from directly accessing WEB-INF
+#
+<Location "/admin/WEB-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#
+# The following line prohibits users from directly accessing META-INF
+#
+<Location "/admin/META-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#######################################################
+# Auto configuration for the /admin context ends.
+#######################################################
+
+#########################################################
+# Auto configuration for the /test context starts.
+#########################################################
+
+#
+# The following line makes apache aware of the location of the /test context
+#
+Alias /test "/opt/jakarta/tomcat/webapps/test"
+<Directory "/opt/jakarta/tomcat/webapps/test">
+    Options Indexes FollowSymLinks
+</Directory>
+
+#
+# The following line mounts all JSP files and the /servlet/ uri to tomcat
+#
+JkMount /test/servlet/* ajp12
+JkMount /test/*.jsp ajp12
+
+#
+# The following line prohibits users from directly accessing WEB-INF
+#
+<Location "/test/WEB-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#
+# The following line prohibits users from directly accessing META-INF
+#
+<Location "/test/META-INF/">
+    AllowOverride None
+    deny from all
+</Location>
+
+#######################################################
+# Auto configuration for the /test context ends.
+#######################################################
+
diff --git a/net-www/tomcat/tomcat-3.2.2.ebuild b/net-www/tomcat/tomcat-3.2.2.ebuild
index 12adf4fc49e4..6981f09b429a 100644
--- a/net-www/tomcat/tomcat-3.2.2.ebuild
+++ b/net-www/tomcat/tomcat-3.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.2.2.ebuild,v 1.2 2001/07/10 02:00:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.2.2.ebuild,v 1.3 2001/07/10 02:23:50 achim Exp $
 
 A="jakarta-tomcat-3.2.2-src.tar.gz jakarta-servletapi-3.2.2-src.tar.gz jakarta-ant-1.3-src.tar.gz"
 S=${WORKDIR}
@@ -64,8 +64,8 @@ src_install() {
   rm -r ${D}/opt/jakarta/tomcat/lib/{ant,jaxp,parser}.jar
   insinto /usr/lib/apache
   doins ${S}/jakarta-tomcat/src/native/apache1.3/mod_jk.so
-  #insinto /etc/httpd
-  #doins ${FILESDIR}/httpd.tomcat
+  insinto /etc/httpd
+  doins ${FILESDIR}/httpd.tomcat
   insinto /etc/rc.d/init.d
   insopts -m755
   doins ${FILESDIR}/tomcat