Changeset 30036

Show
Ignore:
Timestamp:
16.07.2015 22:44:29 (4 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:
2 added
2 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/solr-tomcat-context.xml.in

    r30035 r30036  
    99   
    1010  <!-- 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) --> 
    11   <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="(127\.0\.0\.1|0:0:0:0:0:0:0:1)"/> 
     11  <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="(127\.0\.0\.1|0:0:0:0:0:0:0:1@IPv4@)"/> 
    1212   
    1313</Context> 
  • main/trunk/greenstone3/build.xml

    r30035 r30036  
    14281428 
    14291429    <!-- set up the solr context --> 
     1430     
     1431    <exec executable="${basedir}/IPv4.sh" os="${os.unix}" failonerror="false" outputproperty="ipv4.val"/> 
     1432    <exec executable="${basedir}/IPv4.bat" osfamily="windows" failonerror="false" outputproperty="ipv4.val"/> 
     1433 
     1434 
    14301435    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true"> 
    14311436      <filterset> 
    14321437        <filter token="gsdl3webhome" value="${web.writablehome}"/> 
    14331438    <filter token="tomcathome" value="${basedir}/packages/tomcat"/> 
     1439    <filter token="IPv4" value="${ipv4.val}"/> 
    14341440      </filterset> 
    14351441    </copy>