Commit 53e26b8b authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6183-csr-request-not-created-or-saved-in-ispconfig-3-2-5' into 'develop'

Resolve "CSR request not created or saved in ISPConfig 3.2.5"

Closes #6183

See merge request !1514
parents 1fa53e9f 00c5a217
Pipeline #9304 passed with stage
in 15 seconds
......@@ -353,10 +353,10 @@ class apache2_plugin {
if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) {
$openssl_cmd = 'openssl req -nodes -newkey rsa:4096 -x509 -days ? -keyout ? -out ? -config ?';
$app->system->exec_safe($openssl_cmd, $ssl_days, $openssl_cmd_key_file, $openssl_cmd_crt_file, $config_file);
$app->system->exec_safe("openssl req -new -sha256 -key ? -out ? -days ? -config ?", $openssl_cmd_key_file, $openssl_cmd_csr_file, $ssl_days, $config_file);
if(file_exists($web_config['CA_path'].'/openssl.cnf'))
{
$app->system->exec_safe("openssl req -new -sha256 -key ? -out ? -days ? -config ?", $openssl_cmd_key_file, $openssl_cmd_csr_file, $ssl_days, $config_file);
$app->system->exec_safe("openssl ca -batch -out ? -config ? -passin pass:? -in ? -extfile ?", $openssl_cmd_crt_file, $web_config['CA_path']."/openssl.cnf", $web_config['CA_pass'], $openssl_cmd_csr_file, $ssl_ext_file);
$app->log("Creating CA-signed SSL Cert for: $domain", LOGLEVEL_DEBUG);
if(filesize($crt_file) == 0 || !file_exists($crt_file)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment