Changeset 29845 for main/trunk/greenstone3/resources

Timestamp:

2015-04-21T20:30:46+12:00 (9 years ago)

Author:

ak19

Message:

Modified gs3-server dialog to have an Allow External Connections checkbox to match with GS2. Affects org/greenstone/server code and server.properties file, greenstone.xml.in of tomcat, build.xml and build.properties

Location:

main/trunk/greenstone3/resources

Files:

• java/server.properties (modified) (2 diffs)
• tomcat/greenstone3.xml.in (modified) (1 diff)

main/trunk/greenstone3/resources/java/server.properties

@@ -2 +2 @@
 Server2Settings.Port=Apache port:
 Server2Settings.URL=Library URL prefix:
-Server2Settings.ExternalAccess=Allow external connections
 Server2Settings.AddressResolutionMethod=Address resolution method
 Server2Settings.ResolveIP=Get local IP and resolve to a name
@@ -27 +26 @@
 ServerSettings.SettingChanged=The new settings will be available when you press Enter Library/Restart Library.
 ServerSettings.SettingsUnchangedPortOccupied=Unable to run the Greenstone server on port {0}. It appears to already be in use.
+ServerSettings.ExternalAccess=Allow external connections
 
 ServerControl.EnterLibrary=Enter Library

main/trunk/greenstone3/resources/tomcat/greenstone3.xml.in

@@ -25 +25 @@
          file. -->
     <Manager pathname="SESSIONS.ser" />
+
+    <!-- Allow all machines or just this machine: 127.0.0.1 (IPv4) and 0:0:0:0:0:0:0:1 (IPv6, needed on windows)
+         https://tomcat.apache.org/tomcat-7.0-doc/config/valve.html -->
+    <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="@allowedIPs@"/>
 </Context>