Changeset 32429 for main/trunk/greenstone3/resources/tomcat/server_tomcat7.xml.svn

Timestamp:

2018-09-06T22:32:58+12:00 (6 years ago)

Author:

ak19

Message:

solr should only be accessible locally (from localhost, specifically 127.0.0.1) which means over http. This conflicted with the previous design of the properties file for working with http and/or https. Now we have tomcat.port.https and localhost.port.http, both always set. In place of server.protocol that used to contain the default protocol, we now have server.protocols which can be set to a comma separated list of one or both of http and https. Drastic restructuring followed. I think I've tested all but https certification stuff.

File:

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

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

@@ -68 +68 @@
          Define a non-SSL HTTP/1.1 Connector on port @port@
     -->
-    @http.comment.out.start@
-    <Connector executor="tomcatThreadPool"
-           port="@tomcat.port.http@" protocol="HTTP/1.1"
+    <Connector executor="tomcatThreadPool" @http.address.restriction@
+           port="@localhost.port.http@" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="@https.redirect.port@"
@@ -79 +78 @@
                URIEncoding="UTF-8"
            />
-    @http.comment.out.end@
     <!-- A "Connector" using the shared thread pool-->
     <!--
-    <Connector executor="tomcatThreadPool"
-               port="@tomcat.port.http@" protocol="HTTP/1.1"
+    <Connector executor="tomcatThreadPool" @http.address.restriction@
+               port="@localhost.port.http@" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="@https.redirect.port@" />