Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/install/apache-MiG-template.conf

@@ -744,9 +744,9 @@ __IS_VERIFYCERTS_COMMENTED__ <VirtualHost *:${PUBLIC_HTTP_PORT}>
     # We only override SSLCertificateChainFile *not* SSLCACertificateFile from
     # above. Thus clients can check server cert while we verify clients certs
     # against our own CA.
-    SSLCertificateFile __APACHE_ETC__/MiG-certificates/${PUBLIC_ALIAS_FQDN}/server.crt
-    SSLCertificateKeyFile __APACHE_ETC__/MiG-certificates/${PUBLIC_ALIAS_FQDN}/server.key
-    SSLCertificateChainFile __APACHE_ETC__/MiG-certificates/${PUBLIC_ALIAS_FQDN}/server.ca.pem
+    SSLCertificateFile __MIG_CERTS__/${PUBLIC_ALIAS_FQDN}/server.crt
+    SSLCertificateKeyFile __MIG_CERTS__/${PUBLIC_ALIAS_FQDN}/server.key
+    SSLCertificateChainFile __MIG_CERTS__/${PUBLIC_ALIAS_FQDN}/server.ca.pem
 
     #   SSL Engine Switch:
     #   Enable/Disable SSL for this virtual host.