Changeset 37137

Timestamp:

2023-01-15T00:54:38+13:00 (16 months 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:

• build.properties.svn (modified) (1 diff)
• build.xml (modified) (4 diffs)
• resources/web/global.properties.svn (modified) (1 diff)
• web/interfaces/default/transform/layouts/header-vars.xsl (modified) (1 diff)

main/trunk/greenstone3/build.properties.svn

@@ -7 +7 @@
 # sitting in front of Tomcat, then uncomment the following and set accordingly
 #
-# It is unlikely that you will need to explicity set 'revproxy.port', given the main point
-# of a reverse-proxy web server is to provide a cleaner (hardened) URL for users to access
+# It is unlikely that you will need to explicity set 'revproxy.opt_port', given the main point
+# of a reverse-proxy web server is to provide a cleaner (hardened) URL for users to access.
 # It is included for completeness.
 #
-# If you do not text 'revproxy.context' then it will default to 'greenstone3.context'
+# If you do not set 'revproxy.context' then it will default to 'greenstone3.context'
 #revproxy.protocol=https
-#revproxy.server=<mydomain.org>
-##revproxy.port=8080
+#revproxy.domain=<mydomain.org>
+##revproxy.opt_port=8080
 ##revproxy.context=/greenstone3
 

main/trunk/greenstone3/build.xml

@@ -1216 +1216 @@
   
   <target name="get-revproxy-servlet-url">
-    <if><bool><isset property="revproxy.port"/></bool>
-    <property name="revproxy.optport" value=":${revproxy.port}"/>
+    <if><bool><isset property="revproxy.opt_port"/></bool>
+    <property name="revproxy.colon_opt_port" value=":${revproxy.opt_port}"/>
     <else>
-      <property name="revproxy.optport" value=""/>
+      <property name="revproxy.colon_opt_port" value=""/>
     </else>
     </if>
@@ -1230 +1230 @@
 
     
-    <echo>${revproxy.protocol}://${revproxy.server}${revproxy.optport}${revproxy.app.path}${server.default.servlet}</echo>
+    <echo>${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}${revproxy.app.path}${server.default.servlet}</echo>
   </target>
 
@@ -1253 +1253 @@
 
   <target name="get-external-servlet-url">      
-    <if><bool><isset property="revproxy.server"/></bool>
+    <if><bool><isset property="revproxy.domain"/></bool>
       <antcall target="get-revproxy-servlet-url"/>
       <else>
@@ -1903 +1903 @@
     <filter token="gsdl3writablehome" value="${src.gsdl3.writablehome.unix}"/>
     <filter token="gsdl3version" value="${app.version}"/>
+    <filter token="revproxy.protocol" value="${revproxy.protocol}"/>
+    <filter token="revproxy.domain"   value="${revproxy.domain}"/>
+    <filter token="revproxy.opt_port" value="${revproxy.opt_port}"/>
+    <filter token="revproxy.context"  value="${revproxy.context}"/>
     <filter token="server.protocols" value="${server.protocols}"/>
     <filter token="default.server.protocol" value="${default.server.protocol}"/>

main/trunk/greenstone3/resources/web/global.properties.svn

@@ -31 +31 @@
 [email protected]@
 
+## Reverse Proxy Settings
+[email protected]@
+[email protected]@
+[email protected]_port@
+[email protected]@
+
 
 ## 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

@@ -22 +22 @@
   </xsl:variable>
 
+  <xsl:variable name="servletProtocol">
+    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_protocol']/@value"/>
+  </xsl:variable>
+  <xsl:variable name="servletDomain">
+    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_domain']/@value"/>
+  </xsl:variable>
+  <xsl:variable name="servletOptPort">
+    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_opt_port']/@value"/>
+  </xsl:variable>
+  <xsl:variable name="servletContext">
+    <xsl:value-of select="/page/pageResponse/interfaceOptions/option[@name = 'servlet_context']/@value"/>
+  </xsl:variable>
+  
 </xsl:stylesheet>