Changeset 32346 for main/trunk/greenstone3/resources

Timestamp:

2018-08-17T22:09:16+12:00 (6 years ago)

Author:

ak19

Message:

Configuring tomcat works automatically. Still need to automate getting the certificate (and then later automate renewing the certificate, after first testing I can manually renew it.)

File:

• main/trunk/greenstone3/resources/tomcat/server_tomcat7.xml.svn (modified) (3 diffs)

main/trunk/greenstone3/resources/tomcat/server_tomcat7.xml.svn

@@ -68 +68 @@
          Define a non-SSL HTTP/1.1 Connector on port @port@
     -->
-    <Connector port="@port@" protocol="HTTP/1.1"
+    @http.comment.out.start@
+    <Connector executor="tomcatThreadPool"
+           port="@tomcat.port.http@" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443"
+               redirectPort="@https.redirect.port@"
            compression="on"
            compressionMinSize="524288"
@@ -77 +79 @@
                URIEncoding="UTF-8"
            />
+    @http.comment.out.end@
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
+               port="@tomcat.port.http@" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443" />
+               redirectPort="@https.redirect.port@" />
     -->
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
@@ -93 +96 @@
                clientAuth="false" sslProtocol="TLS" />
     -->
+    @https.comment.out.start@
+    <Connector port="@tomcat.port.https@" protocol="org.apache.coyote.http11.Http11Protocol"
+            maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+            keystoreFile="@keystore.file@"
+            keystorePass="@keystore.pass@"
+            clientAuth="false" sslProtocol="TLS" />
+    @https.comment.out.end@
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="8443" />
-
+    <Connector port="8009" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="@https.redirect.port@" />
 
     <!-- An Engine represents the entry point (within Catalina) that processes