Changeset 32429 for main/trunk/greenstone3/build.properties.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/build.properties.svn (modified) (1 diff)

main/trunk/greenstone3/build.properties.svn

@@ -9 +9 @@
 tomcat.server=localhost
 
-# The default protocol: http, or https for security
-# If you wish to use both, set the default protocol here (https recommended), then
-# uncomment both tomcat.port.http and tomcat.port.https and set them to valid port numbers.
-server.protocol=http
+# server.protocols must contain 'http' or 'https' or both (in order of preference) separated by commas
+# These specify the protocols you want your Digital Library (DL) to be accessible over. 
+# The FIRST ONE in the list will be the default.
+# NOTE: For https support, you will additionally also need to
+# - assign a password to keystore.pass below
+# - ensure an unused and valid port number is assigned to tomcat.port.https below
+# - set tomcat.server above to the primary domain name of your DL, and
+# - run the 'ant setup-https-cert' target to get an official security certificate issued (for which
+# you may need admin/sudo permissions)
+server.protocols=http
+#server.protocols=https
+#server.protocols=https,http
 
-# At minimum, the tomcat.port matching the default server.protocol specified above
-# must be enabled (uncommented) below and be set to a valid port number.
-# You're allowed to enable both tomcat.port values here.
-tomcat.port.http=8383
-#tomcat.port.https=8443
-# You must set a password if using https (if tomcat.port.https is uncommented above)
+# You must set a password if you turned on https support by including 'https' in server.protocols above
 keystore.pass=
+
+# Choose valid port numbers that aren't already in use for tomcat.port.https and localhost.port.http:
+
+# If server.protocols above contains https, then your DL will (additionally) be available over https
+# on the port you assign for tomcat.port.https when you make your DL public.
+# But if server.protocols does not contain https, then tomcat.port.https will remain unused.
+tomcat.port.https=8443
+
+# When the server is running, http will always be available locally at 127.0.0.1 at localhost.port.http
+# If server.protocols above includes http, then your DL will additionally be made public over http
+# (on the hostname denoted by tomcat.server at the port number denoted by localhost.port.http)
+localhost.port.http=8383
 
 # Tomcat's shutdown port - this may need to be changed if you are running two or more Tomcats