Changeset 30036

Timestamp:

2015-07-16T22:44:29+12:00 (9 years ago)

Author:

ak19

Message:

Scripts for adding in the IPv4 of the GS server machine into the solr.xml tomcat context file, so that even if they're not using localhost but the hostname of the machine, the /solr context still works off 8383 (host:port/solr).

Files:

• gs3-extensions/solr/trunk/src/solr-tomcat-context.xml.in (modified) (1 diff)
• main/trunk/greenstone3/IPv4.bat (added)
• main/trunk/greenstone3/IPv4.sh (added)
• main/trunk/greenstone3/build.xml (modified) (1 diff)

gs3-extensions/solr/trunk/src/solr-tomcat-context.xml.in

@@ -9 +9 @@
   
   <!-- Allow this machine: 127.0.0.1 (IPv4) and 0:0:0:0:0:0:0:1 (IPv6, needed on the windows we tested this on) -->
-  <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="(127\.0\.0\.1|0:0:0:0:0:0:0:1)"/>
+  <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="(127\.0\.0\.1|0:0:0:0:0:0:0:1@IPv4@)"/>
   
 </Context>

main/trunk/greenstone3/build.xml

@@ -1428 +1428 @@
 
     <!-- set up the solr context -->
+    
+    <exec executable="${basedir}/IPv4.sh" os="${os.unix}" failonerror="false" outputproperty="ipv4.val"/>
+    <exec executable="${basedir}/IPv4.bat" osfamily="windows" failonerror="false" outputproperty="ipv4.val"/>
+
+
     <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
       <filterset>
         <filter token="gsdl3webhome" value="${web.writablehome}"/>
     <filter token="tomcathome" value="${basedir}/packages/tomcat"/>
+    <filter token="IPv4" value="${ipv4.val}"/>
       </filterset>
     </copy>