Changeset 32416 for main/trunk

Timestamp:

2018-09-03T14:29:32+12:00 (6 years ago)

Author:

ak19

Message:

On windows, only pass in min-min-live for setting up https-certification if not in testing mode.

File:

• main/trunk/greenstone3/build.xml (modified) (4 diffs)

main/trunk/greenstone3/build.xml

@@ -277 +277 @@
   </condition>
 
-  <condition property="https.testing" value="" else="--staging">
-    <isfalse value="${https.test.mode}"/>
-  </condition>
+    <!-- On linux, if testing https certification, pass in minus-minus-staging. If not testing on linux, nothing extra to pass in.
+        On windows, if testing https certification, nothing extra to pass in. If not testing on windows, pass in minus-minus-live.
+        No https certification automation (yet) for macs.
+    -->
+    <if><bool><istrue value="${current.os.isunixnotmac}"/></bool>   
+        <condition property="https.testing" value="" else="--staging">
+            <isfalse value="${https.test.mode}"/>
+        </condition>
+    </if>
+    <if><bool><istrue value="${current.os.iswindows}"/></bool>
+        <condition property="https.testing" value="--live" else="">
+            <isfalse value="${https.test.mode}"/>
+        </condition>
+    </if>
 
   <!-- now we've read in properties, apply defaults -->
@@ -1770 +1781 @@
         le64 ==key "${packages.home}\tomcat\conf\https_cert\privkey.key" ==csr "${packages.home}\tomcat\conf\https_cert\${tomcat.server}.csr" ==csr-key "${packages.home}s\tomcat\conf\https_cert\${tomcat.server}.key" ==crt "${packages.home}\tomcat\conf\https_cert\${tomcat.server}.crt" ==domains "${https.cert.domains}" ==path "${packages.home}\tomcat\webapps\ROOT\.well-known\acme-challenge" ==generate-missing ==unlink ==live -export-pfx "${keystore.pass}"
         
-        which generates a .pfx file with the same name as the PEM certificate (.crt)
+        which generates a .pfx file with the same name as the PEM certificate (.crt param below)
         .pfx vs .p12: https://stackoverflow.com/questions/6819079/convert-pfx-format-to-p12
         
@@ -1787 +1798 @@
       <arg value="--generate-missing" />
       <arg value="--unlink" />
-      <arg line="--live" /><!-- https://stackoverflow.com/questions/11840284/pass-arguments-to-apache-ant-exec-task-based-on-the-variables-value -->
+      <arg line="${https.testing}" /><!-- minus-minus-live if not testing, empty if testing. https://stackoverflow.com/questions/11840284/pass-arguments-to-apache-ant-exec-task-based-on-the-variables-value -->
       <arg value="--export-pfx" /><arg value="${keystore.pass}" />
     </exec>  
@@ -1954 +1965 @@
     <filter token="tomcat.port.http" value="${tomcat.port.http}"/>
     <filter token="tomcat.port.https" value="${tomcat.port.https}"/>
-    <!--<filter token="keystore.file" value="${packages.home}/tomcat/conf/https_cert/${tomcat.server}.jks" />-->
-    <!--ON UNIX: <filter token="keystore.file" value="${packages.home}/tomcat/conf/https_cert/fullchain_and_prvtkey.p12" />-->
+    <!-- Relative path preferred for keystore.file, in case tomcat is moved elsewhere -->
+    <!--<filter token="keystore.file" value="conf/https_cert/${tomcat.server}.jks" />-->
+    <!--ON UNIX: <filter token="keystore.file" value="conf/https_cert/fullchain_and_prvtkey.p12" />-->
     <!--ON WINDOWS: <filter token="keystore.file" value="conf/https_cert/fullchain_and_prvtkey.pfx" />-->
     <filter token="keystore.file" value="conf/https_cert/${keystore.file}" />