openbsd-ports/www/tomcat/v6/patches/patch-conf_server_xml
dcoppa 8ffea42273 Do not hardcode /{etc,var}/tomcat/
Fix the host-manager webapp

Fix {v5,v6}/pkg/README-main files
2011-10-17 11:11:46 +00:00

44 lines
1.9 KiB
Plaintext

$OpenBSD: patch-conf_server_xml,v 1.3 2011/10/17 11:11:46 dcoppa Exp $
--- conf/server.xml.orig Wed Feb 2 20:06:47 2011
+++ conf/server.xml Wed Jun 22 11:03:34 2011
@@ -66,12 +66,12 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
+ <Connector address="0.0.0.0" port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
<!--
- <Connector executor="tomcatThreadPool"
+ <Connector executor="tomcatThreadPool" address="0.0.0.0"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
@@ -81,13 +81,13 @@
connector should be using the OpenSSL style configuration
described in the APR documentation -->
<!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ <Connector address="0.0.0.0" port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+ <Connector address="0.0.0.0" port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -125,7 +125,7 @@
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="${CATALINA_BASE}/webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">