Changeset 29845 for main/trunk/greenstone3/build.xml

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

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -123 +123 @@
   <condition property="privileged.attribute" value="privileged='true'" else=""> 
     <equals arg1="7" arg2="${tomcat.version.major}"/>
+  </condition>
+
+  <!-- external access to the GS3 pages or not 
+       https://tomcat.apache.org/tomcat-7.0-doc/config/valve.html -->
+  <condition property="allowed.IPs" 
+         value=".*" 
+         else="(127\.0\.0\.1|::1|0:0:0:0:0:0:0:1)"> 
+    <matches pattern="^(1|true|yes)$" string="${server.external.access}"/>
   </condition>
 
@@ -1342 +1350 @@
         <filter token="gsdl3webhome" value="${web.home}"/>
         <filter token="gsdl3webwritablehome" value="${web.writablehome}"/>
-    <filter token="privilegedattribute" value ="${privileged.attribute}"/>
+    <filter token="privilegedattribute" value="${privileged.attribute}"/>
+    <filter token="allowedIPs" value="${allowed.IPs}"/>
       </filterset>
     </copy>