Update related fixes.

httpd.conf now uses IfDefine for SSL PHP4 PERL TOMCAT COCOON
cocoon examples now get installed into /opt/tomcat/webapps/cocoon and can be
accessed via http://localhost/cocoon/samles/index.xml
A statuspage is located at http://localhost/cocoon/Cocoon.xml

Tomcat still writes its log files to /usr/local/httpd/logs and /opt/tomcat/logs
this must be change

1 files changed, 26 insertions, 13 deletions

diff --git a/net-www/apache-ssl/files/httpd.conf b/net-www/apache-ssl/files/httpd.conf
index 91a45e59bc01..444d3d7f9b39 100644
--- a/net-www/apache-ssl/files/httpd.conf
+++ b/net-www/apache-ssl/files/httpd.conf
@@ -241,12 +241,15 @@ LoadModule usertrack_module   /usr/lib/apache/mod_usertrack.so
 LoadModule example_module     /usr/lib/apache/mod_example.so
 LoadModule unique_id_module   /usr/lib/apache/mod_unique_id.so
 LoadModule setenvif_module    /usr/lib/apache/mod_setenvif.so
+
 <IfDefine PERL>
 LoadModule perl_module	      /usr/lib/apache/libperl.so
 </IfDefine>
-#LoadModule php4_module	      /usr/lib/apache/libphp4.so
-#LoadModule jserv_module       /usr/lib/apache/mod_jserv.so
-#LoadModule zmod_module	       /usr/lib/apache/mod_zmod.so
+<IfDefine PHP4>
+LoadModule php4_module	      /usr/lib/apache/libphp4.so
+<IfDefine TOMCAT>
+LoadModule jserv_module       /usr/lib/apache/mod_jserv.so
+</IfDefine>
 <IfDefine SSL>
 LoadModule ssl_module         /usr/lib/apache/libssl.so
 </IfDefine>
@@ -293,9 +296,12 @@ AddModule mod_example.c
 AddModule mod_unique_id.c
 AddModule mod_so.c
 AddModule mod_setenvif.c
-#AddModule mod_php4.c
-#AddModule mod_jserv.c
-#AddModule mod_zmod.c
+<IfDefine PHP4>
+AddModule mod_php4.c
+</IfDefine>
+<IfDefine TOMCAT>
+AddModule mod_jserv.c
+</IfDefine>
 <IfDefine PERL>
 AddModule mod_perl.c
 </IfDefine>
@@ -826,13 +832,17 @@ PerlSendHeader On
     # For example, the PHP 3.x module (not part of the Apache distribution - see
     # http://www.php.net) will typically use:
     #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
+    <IfDefine PHP3>
+    AddType application/x-httpd-php3 .php3
+    AddType application/x-httpd-php3-source .php3s
+    </IfDefine>
     #
     # And for PHP 4.x, use:
     #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
+    <IfDefine PHP4>
+    AddType application/x-httpd-php .php
+    AddType application/x-httpd-php-source .phps
+    </IfDefine>
 
     AddType application/x-tar .tgz
 
@@ -1075,11 +1085,11 @@ SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual explusion semaphore the
-#   SSL engine uses internally for inter-process synchronization. 
+#   SSL engine uses internally for inter-process synchronization.
 SSLMutex  file:/var/log/apache/ssl_mutex
 
 #   Pseudo Random Number Generator (PRNG):
-#   Configure one or more sources to seed the PRNG of the 
+#   Configure one or more sources to seed the PRNG of the
 #   SSL library. The seed data should be of good random quality.
 #   WARNING! On some platforms /dev/random blocks if not enough entropy
 #   is available. This means you then cannot use the /dev/random device
@@ -1258,7 +1268,7 @@ SSLCertificateKeyFile /etc/httpd/ssl.key/server.key
 #     alert of the client. This is 100% SSL/TLS standard compliant, but in
 #     practice often causes hanging connections with brain-dead browsers. Use
 #     this only for browsers where you know that their SSL implementation
-#     works correctly. 
+#     works correctly.
 #   Notice: Most problems of broken clients are also related to the HTTP
 #   keep-alive facility, so you usually additionally want to disable
 #   keep-alive for those clients, too. Use variable "nokeepalive" for this.
@@ -1274,4 +1284,7 @@ CustomLog /var/log/apache/ssl_request_log \
 
 </IfDefine>
 
+<IfDefine TOMCAT>
 #Include /etc/httpd/tomcat.conf
+</IfDefine>
+