Changeset 32421 for main/trunk

Show
Ignore:
Timestamp:
03.09.2018 16:50:23 (13 months ago)
Author:
ak19
Message:

1. build.xml now determines the bitness of a Windows OS so it can use the correct ZeroSSL binary when obtaining an https certificate; 2. Tested out getting a test certificate.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32416 r32421  
    290290            <isfalse value="${https.test.mode}"/> 
    291291        </condition> 
     292        <!-- Set bitness of windows OS, so we can use it for the zeroSSL executable. 
     293            The Java system property os.arch will return x86 for 32 bit and AMD64 (or x64) for 64 bit OS. 
     294            See https://stackoverflow.com/questions/20856694/how-to-find-the-os-bit-type --> 
     295        <condition property="os.bitness" value="64" else="32"> 
     296            <matches string="${os.arch}" pattern="64"/> 
     297        </condition>          
    292298    </if> 
    293299 
     
    17881794    <exec executable="cmd" osfamily="windows" dir="${basedir}/bin/${os.bin.dir}" spawn="false"> 
    17891795      <arg value="/c" /> 
    1790       <arg value="le64" /> 
     1796      <arg value="le${os.bitness}" /> 
    17911797      <arg value="--key" /><arg value="${packages.home}\tomcat\conf\https_cert\privkey.key" /> 
    17921798      <arg value="--csr" /><arg value="${packages.home}\tomcat\conf\https_cert\${tomcat.server}.csr" />