From e0d14cb9fd76f65e2f1c28d374132c099ca44608 Mon Sep 17 00:00:00 2001 From: Filip Sushko Date: Tue, 9 Jun 2020 16:57:51 +0300 Subject: [PATCH] SC-3127: added functionality for move ssl cert with right name into deployment directory --- generator/index.php | 3 ++- generator/openssl/generate.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/generator/index.php b/generator/index.php index d803c899b..1f268bd15 100644 --- a/generator/index.php +++ b/generator/index.php @@ -189,9 +189,10 @@ $sslDir = $deploymentDir . DS . 'context' . DS . 'nginx' . DS . 'ssl'; mkdir($sslDir); echo shell_exec(sprintf( - 'PFX_PASSWORD="%s" DESTINATION=%s ./openssl/generate.sh %s', + 'PFX_PASSWORD="%s" DESTINATION=%s DEPLOYMENT_DIR=%s ./openssl/generate.sh %s', addslashes($projectData['docker']['ssl']['pfx-password'] ?? 'secret'), $sslDir, + $deploymentDir, implode(' ', retrieveHostNames($projectData)) )); diff --git a/generator/openssl/generate.sh b/generator/openssl/generate.sh index 70449c14d..beef78b79 100644 --- a/generator/openssl/generate.sh +++ b/generator/openssl/generate.sh @@ -49,3 +49,5 @@ openssl verify \ -verbose \ -CAfile ${DESTINATION}/ca.crt \ ${DESTINATION}/ssl.crt + +cp ${DESTINATION}/ca.crt ${DEPLOYMENT_DIR}/spryker_ca.crt