Changeset 33462

Show
Ignore:
Timestamp:
11.09.2019 20:10:59 (7 days ago)
Author:
ak19
Message:

Tested new tomcat.allowLinking property on Windows too now and it behaves correctly. Cleaning up debug statements and moving properties in build.properties around so that https related proeprties remain grouped together as before.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

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

    r33461 r33462  
    33 
    44## Tomcat installation 
    5  
    6 # Set this to the internet/intranet name of the machine that Tomcat is/will be  
    7 # run on. localhost is fine for accessing the server from the local machine,  
    8 # but not remotely 
    9 tomcat.server=localhost 
    105 
    116# Allow/disallow symlinks inside the web application 
     
    1611# you should ensure this value remains set to false for security reasons. 
    1712tomcat.user.allowLinking=false 
     13 
     14# Set this to the internet/intranet name of the machine that Tomcat is/will be  
     15# run on. localhost is fine for accessing the server from the local machine,  
     16# but not remotely 
     17tomcat.server=localhost 
    1818 
    1919# server.protocols must contain 'http' or 'https' or both (in order of preference) separated by commas 
  • main/trunk/greenstone3/build.xml

    r33461 r33462  
    9797    <os family="windows"/> 
    9898  </condition> 
    99  
    100   <echo>@@@@@@@@@@@@ Current OS iswindows: ${current.os.iswindows}</echo> 
    10199 
    102100  <!-- create build.properties if it has not been created yet --> 
     
    154152    </if> 
    155153  </if> 
    156    
    157   <echo>@@@@@@ tomcat.allowLinking is set to ${tomcat.allowLinking}</echo> 
    158   <echo>tomcat.user.allowLinking is set to ${tomcat.user.allowLinking}</echo> 
    159154   
    160155  <if>