We no longer need to supply server certificate as we now use globally...

We no longer need to supply server certificate as we now use globally recognized LetsEncrypt certificate

common.xml

@@ -182,7 +182,6 @@
   <exec executable="cp" failonerror="true">
    <arg line="-drv ${basedir}/build-system/Makefile.common ${sysdir}/packages"/>
   </exec>
-  <antcall target="fill-secondary-mender-keys"/>
  </target>
 
  <target name="fill-secondary-www">
@@ -205,13 +204,6 @@
   <exec executable="cp" failonerror="true">
    <arg line="-drv ${basedir}/build-system/Makefile.common ${sysdir}/packages"/>
   </exec>
-  <antcall target="fill-secondary-mender-keys"/>
- </target>
-
- <target name="fill-secondary-mender-keys" if="MENDER_KEYS">
-  <exec executable="cp" failonerror="true">
-   <arg line="-drv ${basedir}/host/server.crt ${sysdir}/packages/mender"/>
-  </exec>
  </target>
 
  <target name="run-system-armv7">

mender.xml

 <project name="Mender common elements" xmlns:if="ant:if" xmlns:unless="ant:unless">
 
- <fail message="Mender's private key and certificate are missing">
+ <fail message="Mender's private key is missing">
   <condition>
    <not>
-    <resourcecount count="2">
-     <fileset id="fs" dir="host" includes="private.key,server.crt"/>
+    <resourcecount count="1">
+     <fileset id="fs" dir="host" includes="private.key"/>
     </resourcecount>
    </not>
   </condition>
  </fail>
- <property name="MENDER_KEYS" value="present"/>
 
  <property name="ABstart" value="40"/>
  <property name="ABsize" value="1836"/>
@@ -83,10 +82,10 @@
 
  <target name="post-mender-artifact" depends="build-mender-artifact" if="env.MENDER_USER">
   <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE} ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE}"/>
   </exec>
   <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
   </exec>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
  </target>
@@ -153,10 +152,10 @@
 
  <target name="repost-mender-artifact" depends="rebuild-mender-artifact" if="env.MENDER_USER">
   <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE} ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE}"/>
   </exec>
   <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
   </exec>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
  </target>