Make Tomcat more configurable

[lgpl/argeo-commons.git] / server / modules / org.argeo.server.tomcat / conf / server.xml

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 2e98917a3404ca7154790643c261302f63738738..b138b46a5ddf2aa56e55ef47d8f757d471283c8f 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/conf/server.xml
+++ b/server/modules/org.argeo.server.tomcat/conf/server.xml
@@ -16,14 +16,17 @@
 
                <!-- HTTP -->
                <Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
-                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}" />
-               <!-- HTTPS -->
-               <!-- <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
+                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
+                       secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
+                       proxyPort="${argeo.server.http.proxyPort}" />
+               <!-- HTTPS
+               <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
                        SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
                        keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
                        keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
                        truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
-                       clientAuth="${argeo.server.https.clientAuth}" /> -->
+                       clientAuth="${argeo.server.https.clientAuth}" />
+                        -->
                <!-- AJP (for proxying with httpd) -->
                <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
                        redirectPort="${argeo.server.port.https}" />