@@ -2456,20 +2456,21 @@ public function make_ispconfig_ssl_cert() {
24562456 }
24572457
24582458 if (!@is_dir ($ le_live_dir ) && ($ svr_ip != $ dns_ip )) {
2459-
2460- // We can still use the old self-signed method
2461- $ ssl_pw = substr (md5 (mt_rand ()), 0 , 6 );
2462- exec ("openssl genrsa -des3 -passout pass: $ ssl_pw -out $ ssl_key_file 4096 " );
2463- if (AUTOINSTALL ){
2464- exec ("openssl req -new -passin pass: $ ssl_pw -passout pass: $ ssl_pw -subj '/C= " .escapeshellcmd ($ autoinstall ['ssl_cert_country ' ])."/ST= " .escapeshellcmd ($ autoinstall ['ssl_cert_state ' ])."/L= " .escapeshellcmd ($ autoinstall ['ssl_cert_locality ' ])."/O= " .escapeshellcmd ($ autoinstall ['ssl_cert_organisation ' ])."/OU= " .escapeshellcmd ($ autoinstall ['ssl_cert_organisation_unit ' ])."/CN= " .escapeshellcmd ($ autoinstall ['ssl_cert_common_name ' ])."' -key $ ssl_key_file -out $ ssl_csr_file " );
2465- } else {
2466- exec ("openssl req -new -passin pass: $ ssl_pw -passout pass: $ ssl_pw -key $ ssl_key_file -out $ ssl_csr_file " );
2467- }
2468- exec ("openssl req -x509 -passin pass: $ ssl_pw -passout pass: $ ssl_pw -key $ ssl_key_file -in $ ssl_csr_file -out $ ssl_crt_file -days 3650 " );
2469- exec ("openssl rsa -passin pass: $ ssl_pw -in $ ssl_key_file -out $ ssl_key_file.insecure " );
2470- rename ($ ssl_key_file , $ ssl_key_file .'.secure ' );
2471- rename ($ ssl_key_file .'.insecure ' , $ ssl_key_file );
2472- }
2459+
2460+ // We can still use the old self-signed method
2461+ $ ssl_pw = substr (md5 (mt_rand ()), 0 , 6 );
2462+ exec ("openssl genrsa -des3 -passout pass: $ ssl_pw -out $ ssl_key_file 4096 " );
2463+ if (AUTOINSTALL ){
2464+ exec ("openssl req -new -passin pass: $ ssl_pw -passout pass: $ ssl_pw -subj '/C= " .escapeshellcmd ($ autoinstall ['ssl_cert_country ' ])."/ST= " .escapeshellcmd ($ autoinstall ['ssl_cert_state ' ])."/L= " .escapeshellcmd ($ autoinstall ['ssl_cert_locality ' ])."/O= " .escapeshellcmd ($ autoinstall ['ssl_cert_organisation ' ])."/OU= " .escapeshellcmd ($ autoinstall ['ssl_cert_organisation_unit ' ])."/CN= " .escapeshellcmd ($ autoinstall ['ssl_cert_common_name ' ])."' -key $ ssl_key_file -out $ ssl_csr_file " );
2465+ } else {
2466+ exec ("openssl req -new -passin pass: $ ssl_pw -passout pass: $ ssl_pw -key $ ssl_key_file -out $ ssl_csr_file " );
2467+ }
2468+ exec ("openssl req -x509 -passin pass: $ ssl_pw -passout pass: $ ssl_pw -key $ ssl_key_file -in $ ssl_csr_file -out $ ssl_crt_file -days 3650 " );
2469+ exec ("openssl rsa -passin pass: $ ssl_pw -in $ ssl_key_file -out $ ssl_key_file.insecure " );
2470+ rename ($ ssl_key_file , $ ssl_key_file .'.secure ' );
2471+ rename ($ ssl_key_file .'.insecure ' , $ ssl_key_file );
2472+ }
2473+
24732474 exec ("chown -R root:root $ install_dir/interface/ssl " );
24742475
24752476 }
0 commit comments