Changeset 37137


Ignore:
Timestamp:
2023-01-15T00:54:38+13:00 (3 weeks ago)
Author:
davidb
Message:

Revision in property name, along with changes after testing the new revproxy.protocol, revproxy.domain properties

Location:
main/trunk/greenstone3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.svn

    r37129 r37137  
    77# sitting in front of Tomcat, then uncomment the following and set accordingly
    88#
    9 # It is unlikely that you will need to explicity set 'revproxy.port', given the main point
    10 # of a reverse-proxy web server is to provide a cleaner (hardened) URL for users to access
     9# It is unlikely that you will need to explicity set 'revproxy.opt_port', given the main point
     10# of a reverse-proxy web server is to provide a cleaner (hardened) URL for users to access.
    1111# It is included for completeness.
    1212#
    13 # If you do not text 'revproxy.context' then it will default to 'greenstone3.context'
     13# If you do not set 'revproxy.context' then it will default to 'greenstone3.context'
    1414#revproxy.protocol=https
    15 #revproxy.server=<mydomain.org>
    16 ##revproxy.port=8080
     15#revproxy.domain=<mydomain.org>
     16##revproxy.opt_port=8080
    1717##revproxy.context=/greenstone3
    1818
  • main/trunk/greenstone3/build.xml

    r37130 r37137  
    12161216 
    12171217  <target name="get-revproxy-servlet-url">
    1218     <if><bool><isset property="revproxy.port"/></bool>
    1219     <property name="revproxy.optport" value=":${revproxy.port}"/>
     1218    <if><bool><isset property="revproxy.opt_port"/></bool>
     1219    <property name="revproxy.colon_opt_port" value=":${revproxy.opt_port}"/>
    12201220    <else>
    1221       <property name="revproxy.optport" value=""/>
     1221      <property name="revproxy.colon_opt_port" value=""/>
    12221222    </else>
    12231223    </if>
     
    12301230
    12311231   
    1232     <echo>${revproxy.protocol}://${revproxy.server}${revproxy.optport}${revproxy.app.path}${server.default.servlet}</echo>
     1232    <echo>${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}${revproxy.app.path}${server.default.servlet}</echo>
    12331233  </target>
    12341234
     
    12531253
    12541254  <target name="get-external-servlet-url">     
    1255     <if><bool><isset property="revproxy.server"/></bool>
     1255    <if><bool><isset property="revproxy.domain"/></bool>
    12561256      <antcall target="get-revproxy-servlet-url"/>
    12571257      <else>
     
    19031903    <filter token="gsdl3writablehome" value="${src.gsdl3.writablehome.unix}"/>
    19041904    <filter token="gsdl3version" value="${app.version}"/>
     1905    <filter token="revproxy.protocol" value="${revproxy.protocol}"/>
     1906    <filter token="revproxy.domain"   value="${revproxy.domain}"/>
     1907    <filter token="revproxy.opt_port" value="${revproxy.opt_port}"/>
     1908    <filter token="revproxy.context"  value="${revproxy.context}"/>
    19051909    <filter token="server.protocols" value="${server.protocols}"/>
    19061910    <filter token="default.server.protocol" value="${default.server.protocol}"/>
  • main/trunk/greenstone3/resources/web/global.properties.svn

    r36879 r37137  
    3131tomcat.server.IPregex=@tomcat.server.IPregex@
    3232
     33## Reverse Proxy Settings
     34revproxy.protocol=@revproxy.protocol@
     35revproxy.domain=@revproxy.domain@
     36revproxy.opt_port=@revproxy.opt_port@
     37revproxy.context=@revproxy.context@
     38
    3339
    3440## Proxy setup - set these if you are behind a firewall and you want services that access the internet
  • main/trunk/greenstone3/web/interfaces/default/transform/layouts/header-vars.xsl

    r37092 r37137  
    2222  </xsl:variable>
    2323
     24  <xsl:variable name="servletProtocol">
     25    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_protocol']/@value"/>
     26  </xsl:variable>
     27  <xsl:variable name="servletDomain">
     28    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_domain']/@value"/>
     29  </xsl:variable>
     30  <xsl:variable name="servletOptPort">
     31    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_opt_port']/@value"/>
     32  </xsl:variable>
     33  <xsl:variable name="servletContext">
     34    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_context']/@value"/>
     35  </xsl:variable>
     36 
    2437</xsl:stylesheet>
Note: See TracChangeset for help on using the changeset viewer.